Author: adietish Date: 2010-11-11 09:42:30 -0500 (Thu, 11 Nov 2010) New Revision: 26451 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CVInstanceElementAdapterFactory.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AdaptableToDeltaCloudInstancePropertyTester.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeltaCloudInstanceDialog.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java Removed: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstanceStoppedPropertyTester.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java Log: [JBIDE-7558] start action unified for instance- and cloud-view 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-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2010-11-11 14:42:30 UTC (rev 26451) @@ -12,7 +12,7 @@ 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", - org.jboss.tools.deltacloud.core.client;x-friends:="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" Bundle-ClassPath: ., lib/apache-mime4j-0.6.jar, 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 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -12,9 +12,10 @@ import java.util.List; +import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl; -import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; import org.jboss.tools.deltacloud.core.client.Instance; +import org.jboss.tools.deltacloud.core.client.Instance.State; import org.jboss.tools.deltacloud.core.client.InstanceAction; public class DeltaCloudInstance { @@ -87,6 +88,10 @@ return instance.getPublicAddresses(); } + public boolean isStopped() { + return instance.getState() == State.STOPPED; + } + public String getHostName() { List<String> hostNames = getHostNames(); if (hostNames != null && hostNames.size() > 0) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-11-11 14:42:30 UTC (rev 26451) @@ -5,7 +5,7 @@ <booleanAttribute key="automaticAdd" value="true"/> <booleanAttribute key="automaticValidate" value="false"/> <stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> +<stringAttribute key="checked" value="org.eclipse.core.expressions"/> <booleanAttribute key="clearConfig" value="true"/> <booleanAttribute key="clearws" value="false"/> <booleanAttribute key="clearwslog" value="false"/> @@ -18,16 +18,551 @@ <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> </listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -debug"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <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.emf.common@default:default,org.eclipse.sdk@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.compare@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.databinding.observable@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.ecf@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.app@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.filebuffers@default:! default,org.eclipse.equinox.security.ui@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.sse.core@default:default,org.apache.ant@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jdt.ui@default:default,org.eclipse.ui.ide@default:default,org.eclipse.update.configurator@3:true,javax.servlet@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.console@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jdt.launching@default:default,org.apache.xml.resolver@default:default,org.eclipse.search@default:default,org.eclipse.osgi.services@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.core.manipulation@default:default,org.junit4@defaul! t:default,org.apache.commons.el@default:default,org.eclipse.jf! ace@defa ult:default,org.eclipse.ui.views@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.core.databinding@default:default,org.eclipse.rse.services@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.team.ui@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.resources@default:default,org.apache.jasper@default:default,org.eclipse.ui@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.security@default:default,org.eclipse.rse.core@default:default,org.apache.lucene@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jem.util@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.p2.engine@default:defau! lt,com.ibm.icu@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jdt.core@default:default,org.apache.lucene.analysis@default:default,javax.xml@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.core.runtime@default:true,org.eclipse.compare.core@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.osgi@-1:true,org.eclipse.ltk.ui.refactoring@default:default,org.apache.xml.serializer@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.validation@default:default,org.eclipse.text@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.databinding.beans@default:default,org.mortbay.jetty.util@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.common@2:true,org.! eclipse.debug.ui@default:default,org.eclipse.ant.core@default:! default, org.eclipse.core.commands@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.workbench@default:default,org.apache.xerces@default:default,com.instantiations.designer.jdt.fragment@default:false,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.hamcrest.core@default:default,org.eclipse.help@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.help.ui@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.filesystem.linux.x86_64! @default:false,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.equinox.http.jetty@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.team.core@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.common@default:default"/> +<stringAttribute key="selectedPlugin" value="org.eclipse.core.expressions"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.jdt.core@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.team.ui@default:default,org.eclipse.help.ui@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.core.resources@default:default,org.eclipse.equinox.security.ui@default:default,org.hamcrest.core@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.jasper@default:default,org.eclipse.jface@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jem.util@! default:default,org.mortbay.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.apache.ant@default:default,org.eclipse.wst.validation@default:default,org.mortbay.jetty.server@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.debug.ui@default:default,org.apache.commons.el@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.commands@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.console@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.p2.repository@default:default,! org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.ecli! pse.ecf@ default:default,org.eclipse.ui.workbench@default:default,org.eclipse.help@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.app@default:default,org.junit4@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.osgi.util@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.emf.edit@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.registry@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.e! quinox.common@2:true,org.eclipse.ecf.identity@default:default,org.eclipse.compare.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.core.jobs@default:default,org.eclipse.wst.common.project.facet.core@default:default,javax.xml@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.help.base@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.swt@default:default,org.eclipse.core.variables@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.xerces@default:default,org.eclipse.emf.common@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.ui.forms@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.core.net.lin! ux.x86_64@default:false,org.eclipse.osgi.services@default:defa! ult,org. apache.lucene@default:default,org.eclipse.ui.views@default:default,org.eclipse.rse.services@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.rse.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.wst.common.environment@default:default,org.apache.xml.resolver@default:default,org.eclipse.compare@default:default,org.eclipse.ui.ide@default:default,javax.servlet@default:default,org.eclipse.search@default:default,org.eclipse.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.text@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.launching@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.team.core@default:default,com.instantiations.designer.jdt.fragment@default:false,org.apache.xml.! serializer@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.sdk@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,com.ibm.icu@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.apache.lucene.analysis@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.deltacloud.ui@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> -<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="tracing" value="true"/> +<mapAttribute key="tracingOptions"> +<mapEntry key="com.ibm.datatools.core.ui/debug" value="true"/> +<mapEntry key="com.ibm.datatools.core.ui/editor/log" value="true"/> +<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/log" value="true"/> +<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/trace" value="true"/> +<mapEntry key="com.ibm.datatools.core.ui/modelExplorerDecoration/trace" value="true"/> +<mapEntry key="com.ibm.datatools.core.ui/plugin/log" value="true"/> +<mapEntry key="com.instantiations.eclipse.debug/debug" value="true"/> +<mapEntry key="com.instantiations.eclipse.startup/startup" value="true"/> +<mapEntry key="com.instantiations.eclipse.startup/startupUI" value="true"/> +<mapEntry key="com.instantiations.tools/debug" value="true"/> +<mapEntry key="com.instantiations.tools/debug/BundleManager" value="true"/> +<mapEntry key="com.instantiations.tools/debug/BundleManagerPlugins" value="false"/> +<mapEntry key="com.instantiations.tools/debug/BundleManagerTrace" value="false"/> +<mapEntry key="com.instantiations.tools/debug/ConfigScriptGeneration" value="true"/> +<mapEntry key="com.instantiations.tools/debug/ConfigScriptGenerationTrace" value="false"/> +<mapEntry key="com.instantiations.tools/debug/ElementScriptGeneration" value="true"/> +<mapEntry key="com.instantiations.tools/debug/JarScriptGeneration" value="true"/> +<mapEntry key="com.instantiations.tools/debug/ProductReader" value="true"/> +<mapEntry key="com.instantiations.tools/debug/ProductReaderTracing" value="false"/> +<mapEntry key="com.instantiations.tools/debug/ProductReaderXmlDetail" value="false"/> +<mapEntry key="com.instantiations.tools/debug/ProductReaderXmlSumary" value="true"/> +<mapEntry key="com.instantiations.tools/debug/ResourceUtils" value="true"/> +<mapEntry key="org.eclipse.cdt.core/debug" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/ASTCache" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/deltaprocessor" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/formatter" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/index/locks" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/indexer/activity" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/indexer/problems" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/indexer/problems/inclusion" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/indexer/problems/scanner" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/indexer/problems/syntax" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/indexer/statistics" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/matchlocator" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/model" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/parser" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/parser/exceptions" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/scanner" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/search" value="false"/> +<mapEntry key="org.eclipse.cdt.core/debug/typeresolver" value="false"/> +<mapEntry key="org.eclipse.cdt.debug.mi.core/debug" value="true"/> +<mapEntry key="org.eclipse.cdt.dsf.gdb/debug" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/disassembly" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/stepping" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/atomicUpdate" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/cache" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/contentProvider" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/delta" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/presentationId" value=""/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/updates" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf.ui/debug/vm/updates/regex" value=""/> +<mapEntry key="org.eclipse.cdt.dsf/debug" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf/debug/executor" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf/debug/executorName" value=""/> +<mapEntry key="org.eclipse.cdt.dsf/debug/monitors" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf/debug/session" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf/debug/session/dispatches" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf/debug/session/listeners" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf/debug/session/modelAdapters" value="false"/> +<mapEntry key="org.eclipse.cdt.dsf/debugCache" value="false"/> +<mapEntry key="org.eclipse.cdt.ui/debug" value="false"/> +<mapEntry key="org.eclipse.cdt.ui/debug/SemanticHighlighting" value="false"/> +<mapEntry key="org.eclipse.cdt.ui/debug/contentassist" value="false"/> +<mapEntry key="org.eclipse.cdt.ui/debug/folding" value="false"/> +<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/> +<mapEntry key="org.eclipse.core.expressions/debug/TypeExtensionManager" value="true"/> +<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="true"/> +<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/> +<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/> +<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/> +<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/> +<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/> +<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/> +<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/> +<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/> +<mapEntry key="org.eclipse.core.resources/debug" value="false"/> +<mapEntry key="org.eclipse.core.resources/history" value="false"/> +<mapEntry key="org.eclipse.core.resources/natures" value="false"/> +<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/> +<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/> +<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/> +<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/> +<mapEntry key="org.eclipse.core.resources/preferences" value="false"/> +<mapEntry key="org.eclipse.core.resources/refresh" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> +<mapEntry key="org.eclipse.core.resources/save" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> +<mapEntry key="org.eclipse.core.resources/strings" value="false"/> +<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/> +<mapEntry key="org.eclipse.core.runtime/perf" value="false"/> +<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/> +<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> +<mapEntry key="org.eclipse.datatools.connectivity.sqm.core/debug" value="false"/> +<mapEntry key="org.eclipse.datatools.connectivity/connectionprofileextension" value="false"/> +<mapEntry key="org.eclipse.datatools.connectivity/debug" value="true"/> +<mapEntry key="org.eclipse.debug.core/debug" value="false"/> +<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/> +<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/breadcrumb" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/viewers/breakpointDeltas" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/viewers/presentationId" value=""/> +<mapEntry key="org.eclipse.debug.ui/debug/viewers/stateSaveRestore" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/> +<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/> +<mapEntry key="org.eclipse.egit.core/debug" value="false"/> +<mapEntry key="org.eclipse.egit.core/debug/core" value="false"/> +<mapEntry key="org.eclipse.egit.ui/debug" value="false"/> +<mapEntry key="org.eclipse.egit.ui/debug/quickdiff" value="false"/> +<mapEntry key="org.eclipse.egit.ui/debug/repochangescanner" value="false"/> +<mapEntry key="org.eclipse.egit.ui/debug/ui" value="false"/> +<mapEntry key="org.eclipse.egit.ui/debug/ui/decoration" value="false"/> +<mapEntry key="org.eclipse.egit.ui/debug/ui/repositoriesview" value="false"/> +<mapEntry key="org.eclipse.equinox.ds/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.ds/instantiate_all" value="false"/> +<mapEntry key="org.eclipse.equinox.ds/performance" value="false"/> +<mapEntry key="org.eclipse.equinox.ds/print_on_console" value="false"/> +<mapEntry key="org.eclipse.equinox.p2.engine/engine/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.p2.engine/enginesession/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.p2.engine/profileregistry/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/> +<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/> +<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/> +<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/> +<mapEntry key="org.eclipse.equinox.security.ui/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.security.ui/debug/storage" value="false"/> +<mapEntry key="org.eclipse.equinox.security/debug" value="false"/> +<mapEntry key="org.eclipse.equinox.security/debug/loginFramework" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug" value="true"/> +<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> +<mapEntry key="org.eclipse.help.webapp/debug" value="true"/> +<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/> +<mapEntry key="org.eclipse.help/debug" value="true"/> +<mapEntry key="org.eclipse.help/debug/context" value="false"/> +<mapEntry key="org.eclipse.help/debug/search" value="false"/> +<mapEntry key="org.eclipse.help/debug/toc" value="false"/> +<mapEntry key="org.eclipse.jdt.apt.core/debug" value="false"/> +<mapEntry key="org.eclipse.jdt.apt.core/debug/compilationEnv" value="false"/> +<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFileMaps" value="false"/> +<mapEntry key="org.eclipse.jdt.apt.core/debug/generatedFiles" value="false"/> +<mapEntry key="org.eclipse.jdt.apt.pluggable.core/debug" value="false"/> +<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/builder/stats" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/failure" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/formatter" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/indexmanager/advanced" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> +<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/> +<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/> +<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/> +<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/> +<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/> +<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/> +<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/> +<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/debug/BreadcrumbItemDropDown" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/> +<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/> +<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/> +<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/> +<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/> +<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/> +<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/> +<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/> +<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/> +<mapEntry key="org.eclipse.jem.beaninfo/debug/logtracefile" value="default"/> +<mapEntry key="org.eclipse.jem.proxy/debug/loglevel" value="default"/> +<mapEntry key="org.eclipse.jem.proxy/debug/logtrace" value="default"/> +<mapEntry key="org.eclipse.jem.proxy/debug/logtracefile" value="default"/> +<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressions" value="false"/> +<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressionstimethreshold" value="100"/> +<mapEntry key="org.eclipse.jem.proxy/remote/debug/debugvm" value="false"/> +<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/> +<mapEntry key="org.eclipse.jem.proxy/remote/debug/notimeouts" value="false"/> +<mapEntry key="org.eclipse.jem.proxy/remote/debug/vmtraceout" value="false"/> +<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/> +<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/> +<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/> +<mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/> +<mapEntry key="org.eclipse.jem/debug/logtrace" value="default"/> +<mapEntry key="org.eclipse.jem/debug/logtracefile" value="default"/> +<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/> +<mapEntry key="org.eclipse.jface.text/assert/TextSelection/validConstructorArguments" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/AbstractInformationControlManager" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/> +<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.common/debug" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.common/debug/lifecyclelistener" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.common/debug/metadataload" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.core/debug" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.core/designtime/view/jsptagintrospection" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.core/designtime/view/jsptagintrospection/perf" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.core/designtime/view/jsptagpersistence" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.core/designtime/view/jsptagregistry" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.core/designtime/view/jsptagregistry/changes" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.core/designtime/view/jsptagregistry/perf" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.core/designtime/view/tldregistrymanager" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.ui/debug" value="false"/> +<mapEntry key="org.eclipse.jst.jsf.ui/metadatagen" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug" value="true"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/jspindexmanager" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/jspjavamapping" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/jspsearch" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/jsptranslation" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/jsptranslationstodisk" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/jspvalidator" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/taglibclassloader" value=""/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/taglibvars" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/tldcmdocument/cache" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/tldcmdocument/factory" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/tldcmdocument/manager" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/debug/tracefilter" value=""/> +<mapEntry key="org.eclipse.jst.jsp.core/taglib/events" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/taglib/indexcreation" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/taglib/indextime" value="false"/> +<mapEntry key="org.eclipse.jst.jsp.core/taglib/resolve" value="false"/> +<mapEntry key="org.eclipse.jst.pagedesigner/debug" value="true"/> +<mapEntry key="org.eclipse.jst.pagedesigner/debug/converter/load" value="false"/> +<mapEntry key="org.eclipse.jst.pagedesigner/debug/converter/selection" value="false"/> +<mapEntry key="org.eclipse.jst.pagedesigner/debug/elementedit/load" value="false"/> +<mapEntry key="org.eclipse.jst.pagedesigner/debug/elementedit/selection" value="false"/> +<mapEntry key="org.eclipse.jst.server.tomcat.core/debug" value="true"/> +<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/> +<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/> +<mapEntry key="org.eclipse.osgi/debug" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/events" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/objectPool/adds" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/objectPool/dups" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/security" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/services" value="false"/> +<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/> +<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/> +<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/cachedmanifest" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/> +<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/> +<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/> +<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/> +<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/> +<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/> +<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/> +<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/> +<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/uses" value="false"/> +<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/> +<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/> +<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/> +<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/> +<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/> +<mapEntry key="org.eclipse.pde.build/debug" value="false"/> +<mapEntry key="org.eclipse.pde.core/cache" value="false"/> +<mapEntry key="org.eclipse.pde.core/classpath" value="false"/> +<mapEntry key="org.eclipse.pde.core/debug" value="true"/> +<mapEntry key="org.eclipse.pde.core/validation" value="false"/> +<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/> +<mapEntry key="org.eclipse.team.core/debug" value="false"/> +<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/> +<mapEntry key="org.eclipse.team.core/streams" value="false"/> +<mapEntry key="org.eclipse.team.core/threading" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> +<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/> +<mapEntry key="org.eclipse.ui.browser/debug" value="false"/> +<mapEntry key="org.eclipse.ui.ide/debug" value="false"/> +<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/> +<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/> +<mapEntry key="org.eclipse.ui.ide/debug/markers" value="false"/> +<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/> +<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/> +<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/> +<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/> +<mapEntry key="org.eclipse.ui.intro/debug" value="true"/> +<mapEntry key="org.eclipse.ui.intro/debug/toolbar" value="false"/> +<mapEntry key="org.eclipse.ui.intro/flags/noBrowser" value="false"/> +<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/> +<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/> +<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/> +<mapEntry key="org.eclipse.ui.navigator/debug" value="false"/> +<mapEntry key="org.eclipse.ui.navigator/debug/dnd" value="false"/> +<mapEntry key="org.eclipse.ui.navigator/debug/resolution" value="false"/> +<mapEntry key="org.eclipse.ui.navigator/debug/setup" value="false"/> +<mapEntry key="org.eclipse.ui.navigator/debug/sort" value="false"/> +<mapEntry key="org.eclipse.ui.navigator/debug/viewermap" value="false"/> +<mapEntry key="org.eclipse.ui.navigator/perf/explorer/createPartControl" value="1300"/> +<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/> +<mapEntry key="org.eclipse.ui/debug" value="false"/> +<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/> +<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/> +<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/> +<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/> +<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/> +<mapEntry key="org.eclipse.ui/debug/swtdebugglobal" value="false"/> +<mapEntry key="org.eclipse.ui/debug/workingSets" value="false"/> +<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/> +<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/> +<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/> +<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/> +<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/> +<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/> +<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/> +<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/> +<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/> +<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/> +<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/> +<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/> +<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/> +<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/> +<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/> +<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/> +<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/> +<mapEntry key="org.eclipse.ui/trace/commands" value="false"/> +<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/> +<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/> +<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/> +<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/> +<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/> +<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/> +<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/> +<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/> +<mapEntry key="org.eclipse.ui/trace/operations" value="false"/> +<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/> +<mapEntry key="org.eclipse.ui/trace/sources" value="false"/> +<mapEntry key="org.eclipse.update.configurator/debug" value="false"/> +<mapEntry key="org.eclipse.update.core/debug" value="true"/> +<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/install" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> +<mapEntry key="org.eclipse.wst.common.environment/debug" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/command" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/data" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/emitter" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/error" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/info" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/ws_ant" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/ws_dt_cmd_engine" value="true"/> +<mapEntry key="org.eclipse.wst.common.environment/trace/ws_framework" value="true"/> +<mapEntry key="org.eclipse.wst.common.project.facet.core/actionSorting" value="false"/> +<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/> +<mapEntry key="org.eclipse.wst.common.project.facet.core/delegate/calls" value="false"/> +<mapEntry key="org.eclipse.wst.common.project.facet.core/events/project" value="false"/> +<mapEntry key="org.eclipse.wst.common.project.facet.core/events/project/stacktrace" value="false"/> +<mapEntry key="org.eclipse.wst.common.project.facet.ui/propPage/actionConfigValidation" value="false"/> +<mapEntry key="org.eclipse.wst.css.core/debug" value="true"/> +<mapEntry key="org.eclipse.wst.css.core/debug/tracefilter" value=""/> +<mapEntry key="org.eclipse.wst.css.ui/projectionperf" value="false"/> +<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/> +<mapEntry key="org.eclipse.wst.html.core/debug" value="true"/> +<mapEntry key="org.eclipse.wst.html.core/debug/tracefilter" value=""/> +<mapEntry key="org.eclipse.wst.internet.monitor.core/debug" value="true"/> +<mapEntry key="org.eclipse.wst.internet.monitor.core/parsing" value="false"/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/debug" value="true"/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/debug/jsindexmanager" value="false"/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/debug/jsjavamapping" value="false"/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/debug/jssearch" value="false"/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/debug/jstranslation" value="false"/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/debug/jstranslationstodisk" value="false"/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/debug/jsvalidator" value="false"/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/debug/tracefilter" value=""/> +<mapEntry key="org.eclipse.wst.jsdt.web.core/taglib/resolve" value="false"/> +<mapEntry key="org.eclipse.wst.server.core/debug" value="true"/> +<mapEntry key="org.eclipse.wst.server.core/extension_point" value="false"/> +<mapEntry key="org.eclipse.wst.server.core/listeners" value="false"/> +<mapEntry key="org.eclipse.wst.server.core/performance" value="false"/> +<mapEntry key="org.eclipse.wst.server.core/resources" value="false"/> +<mapEntry key="org.eclipse.wst.server.discovery/debug" value="true"/> +<mapEntry key="org.eclipse.wst.server.ui/debug" value="true"/> +<mapEntry key="org.eclipse.wst.server.ui/extension_point" value="false"/> +<mapEntry key="org.eclipse.wst.server.ui/performance" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/debug" value="true"/> +<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/> +<mapEntry key="org.eclipse.wst.sse.core/filebuffers/leaks" value="true"/> +<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/format" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/structureddocument" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/locks" value="true"/> +<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/modelmanager" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/state" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/tasks/detection" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/tasks/job" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/tasks/overalltime" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/tasks/preferences" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/tasks/registry" value="false"/> +<mapEntry key="org.eclipse.wst.sse.core/tasks/time" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/> +<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling/showProblems" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidatorEnablement" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidatorSupported" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidators" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerjob" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/> +<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugmenu" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugpopup" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugtoolbar" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/readtime" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/gotoNextAnnotation" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/propertyChangeUpdateActionContributionItem" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/propertySheet" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/structuredPresentationReconciler" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/structuredPresentationReconciler/time" value="false"/> +<mapEntry key="org.eclipse.wst.sse.ui/transferbuilder/time" value="false"/> +<mapEntry key="org.eclipse.wst.validation/debug" value="true"/> +<mapEntry key="org.eclipse.wst.validation/extraValDetail" value=""/> +<mapEntry key="org.eclipse.wst.validation/filter/allExcept" value=""/> +<mapEntry key="org.eclipse.wst.validation/timings" value="false"/> +<mapEntry key="org.eclipse.wst.validation/timings/tracefile" value=""/> +<mapEntry key="org.eclipse.wst.validation/timings/useDoubles" value="false"/> +<mapEntry key="org.eclipse.wst.validation/trace/level" value=""/> +<mapEntry key="org.eclipse.wst.validation/v1" value="false"/> +<mapEntry key="org.eclipse.wst.xml.core/debug" value="true"/> +<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentcache" value="false"/> +<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentmanager" value="false"/> +<mapEntry key="org.eclipse.wst.xml.core/debug/tracefilter" value=""/> +<mapEntry key="org.eclipse.wst.xml.ui/projectionperf" value="false"/> +<mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/> +<mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/> +<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/> +<mapEntry key="org.guvnor.tools/debugHttpClient" value="false"/> +<mapEntry key="org.jboss.tools.tests/debug" value="true"/> +<mapEntry key="org.jboss.tools.tests/debug/importProject" value="true"/> +<mapEntry key="org.maven.ide.eclipse/actions" value="false"/> +<mapEntry key="org.maven.ide.eclipse/console" value="false"/> +<mapEntry key="org.maven.ide.eclipse/debug" value="false"/> +<mapEntry key="org.maven.ide.eclipse/debug/builder" value="false"/> +<mapEntry key="org.maven.ide.eclipse/debug/initialization" value="false"/> +<mapEntry key="org.maven.ide.eclipse/debug/projectManager" value="false"/> +<mapEntry key="org.maven.ide.eclipse/launcher" value="false"/> +<mapEntry key="org.maven.ide.eclipse/plugin" value="false"/> +<mapEntry key="org.projectusus.core/RESOURCE_CHANGES" value="false"/> +<mapEntry key="org.projectusus.core/SQI" value="false"/> +</mapAttribute> <booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-11 14:42:30 UTC (rev 26451) @@ -150,25 +150,31 @@ </with> </activeWhen> </handler> - <!-- instance command handlers --> + </extension> + <!-- instance command handlers --> + <extension + point="org.eclipse.ui.handlers"> <handler class="org.jboss.tools.deltacloud.ui.commands.StartInstanceHandler" commandId="org.jboss.tools.deltacloud.ui.startinstance"> - <activeWhen> + <enabledWhen> <with - variable="selection"> - <iterate operator="and"> - <and> - <instanceof - value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement"> - </instanceof> - <test - property="org.jboss.tools.deltacloud.ui.instance.isStopped" - value="true"/> - </and> - </iterate> + variable="selection"> + <iterate operator="and"> + <and> +<!-- <or> + <instanceof value="org.jboss.tools.deltacloud.ui.views.CVInstanceElement" /> + <instanceof value="org.jboss.tools.deltacloud.core.DeltaCloudInstance" /> + </or> --> + <adapt + type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> + <test property="org.jboss.tools.deltacloud.ui.commands.isStopped" + value="true"/> + </adapt> + </and> + </iterate> </with> - </activeWhen> + </enabledWhen> </handler> <handler class="org.jboss.tools.deltacloud.ui.commands.StopInstanceHandler" @@ -240,6 +246,9 @@ </with> </activeWhen> </handler> + </extension> + <extension + point="org.eclipse.ui.handlers"> <!-- image command handlers --> <handler class="org.jboss.tools.deltacloud.ui.commands.CreateInstanceHandler" @@ -255,6 +264,9 @@ </with> </activeWhen> </handler> + </extension> + <extension + point="org.eclipse.ui.handlers"> <!-- Filter handlers --> <handler class="org.jboss.tools.deltacloud.ui.commands.FilterImagesHandler" @@ -561,16 +573,37 @@ id="org.jboss.tools.deltacloud.ui.filterinstances" name="%command.filterinstances.name"> </command> - </extension> - <extension - point="org.eclipse.core.expressions.propertyTesters"> - <propertyTester - class="org.jboss.tools.deltacloud.ui.commands.InstanceStoppedPropertyTester" - id="org.jboss.tools.deltacloud.ui.commands.InstanceStoppedPropertyTester" - namespace="org.jboss.tools.deltacloud.ui.instance" - properties="isStopped" - type="org.jboss.tools.deltacloud.ui.views.CVInstanceElement"> - </propertyTester> - </extension> + </extension> + <extension point="org.eclipse.core.expressions.propertyTesters"> + <propertyTester + class="org.jboss.tools.deltacloud.ui.commands.InstancePropertyTester" + id="org.jboss.tools.deltacloud.ui.commands.instancepropertytester" + namespace="org.jboss.tools.deltacloud.ui.commands" + properties="isStopped,isStarted" + type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> + </propertyTester> + </extension> + <extension point="org.eclipse.core.expressions.definitions"> + <definition id="org.jboss.tools.deltacloud.ui.commands.instanceStopped"> + <with + variable="selection"> + <iterate operator="or"> + <adapt + type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> + </adapt> + </iterate> + </with> + </definition> + </extension> + <extension + point="org.eclipse.core.runtime.adapters"> + <factory + adaptableType="org.jboss.tools.deltacloud.ui.views.CVInstanceElement" + class="org.jboss.tools.deltacloud.ui.CVInstanceElementAdapterFactory"> + <adapter + type="org.jboss.tools.deltacloud.core.DeltaCloudInstance"> + </adapter> + </factory> + </extension> </plugin> Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CVInstanceElementAdapterFactory.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CVInstanceElementAdapterFactory.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CVInstanceElementAdapterFactory.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -0,0 +1,23 @@ +package org.jboss.tools.deltacloud.ui; + +import org.eclipse.core.runtime.IAdapterFactory; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; + +public class CVInstanceElementAdapterFactory implements IAdapterFactory { + + private static final Class[] ADAPTERS = new Class[]{ + DeltaCloudInstance.class + }; + + @Override + public Object getAdapter(Object adaptableObject, Class adapterType) { + return UIUtils.adapt(adaptableObject, DeltaCloudInstance.class); + } + + @Override + public Class[] getAdapterList() { + return ADAPTERS; + } + +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/CVInstanceElementAdapterFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -13,10 +13,7 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.IHandler; import org.eclipse.jface.viewers.ISelection; -import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.ui.views.CVInstanceElement; -import org.jboss.tools.deltacloud.ui.views.CloudViewElementUtils; import org.jboss.tools.deltacloud.ui.views.PerformInstanceActionThread; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; @@ -27,13 +24,11 @@ */ public abstract class AbstractInstanceHandler extends AbstractHandler implements IHandler { - protected void executeInstanceAction(CVInstanceElement cvInstance, String actionId, String expectedState, + protected void executeInstanceAction(DeltaCloudInstance instance, String actionId, String expectedState, String title, String message) { - if (cvInstance != null) { - DeltaCloudInstance instance = (DeltaCloudInstance) cvInstance.getElement(); - DeltaCloud cloud = CloudViewElementUtils.getCloud(cvInstance); + if (instance != null) { PerformInstanceActionThread t = new PerformInstanceActionThread( - cloud, + instance.getDeltaCloud(), instance, actionId, title, @@ -45,6 +40,6 @@ } protected boolean isSingleInstanceSelected(ISelection selection) { - return UIUtils.isSingleSelection(selection, CVInstanceElement.class); + return UIUtils.isSingleSelection(selection, DeltaCloudInstance.class); } } Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AdaptableToDeltaCloudInstancePropertyTester.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AdaptableToDeltaCloudInstancePropertyTester.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AdaptableToDeltaCloudInstancePropertyTester.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.deltacloud.ui.commands; + +import org.eclipse.core.expressions.PropertyTester; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; + +/** + * A property tester for the command framework that answers if the given + * instance is stopped + * + * @author Andre Dietisheim + */ +public class AdaptableToDeltaCloudInstancePropertyTester extends PropertyTester { + + @Override + public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { + DeltaCloudInstance instance = UIUtils.adapt(receiver, DeltaCloudInstance.class); + Boolean isAdaptableExpectedValue = (Boolean) expectedValue; + return isAdaptableExpectedValue.equals(instance != null); + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AdaptableToDeltaCloudInstancePropertyTester.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -1,69 +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.ui.commands; - -import java.util.Collection; - -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.dialogs.ListSelectionDialog; -import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.ui.views.CVInstanceElement; - -/** - * A dialog that allows the user to select CVInstanceElements - * - * @see CVInstanceElement - */ -public class CVInstanceElementsSelectionDialog extends ListSelectionDialog { - - private static class DeltaCloudInstanceProvider implements IStructuredContentProvider { - - @Override - public Object[] getElements(Object deltaCloudInstances) { - Assert.isTrue(deltaCloudInstances instanceof Collection); - Collection<?> instances = (Collection<?>) deltaCloudInstances; - return instances.toArray(new Object[instances.size()]); - } - - @Override - public void dispose() { - } - - @Override - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - } - - private static class CloudElementNameProvider extends LabelProvider { - public String getText(Object element) { - Assert.isTrue(element instanceof IAdaptable); - DeltaCloudInstance deltaCloudInstance = (DeltaCloudInstance) ((IAdaptable) element).getAdapter(DeltaCloudInstance.class); - if (deltaCloudInstance != null) { - return deltaCloudInstance.getName(); - } - return ((CVInstanceElement) element).getName(); - } - }; - - public CVInstanceElementsSelectionDialog(Shell parentShell, Collection<?> cloudViewElements, String title, String message) { - super(parentShell - , cloudViewElements - , new DeltaCloudInstanceProvider() - , new CloudElementNameProvider() - , message); - setTitle(title); - } -} \ No newline at end of file Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeltaCloudInstanceDialog.java (from rev 26374, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/CVInstanceElementsSelectionDialog.java) =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeltaCloudInstanceDialog.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeltaCloudInstanceDialog.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.deltacloud.ui.commands; + +import java.util.Collection; + +import org.eclipse.jface.viewers.ArrayContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.dialogs.ListSelectionDialog; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; + +/** + * A dialog that allows the user to select CVInstanceElements + * + * @see DeltaCloudInstance + */ +public class DeltaCloudInstanceDialog extends ListSelectionDialog { + + private static class CloudElementNameProvider extends LabelProvider { + public String getText(Object element) { + DeltaCloudInstance instance = UIUtils.adapt(element, DeltaCloudInstance.class); + if (instance != null) { + return instance.getName(); + } else { + return null; + } + } + }; + + public DeltaCloudInstanceDialog(Shell parentShell, Collection<DeltaCloudInstance> cloudViewElements, String title, String message) { + super(parentShell + , cloudViewElements + , ArrayContentProvider.getInstance() + , new CloudElementNameProvider() + , message); + setTitle(title); + } +} \ No newline at end of file Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DeltaCloudInstanceDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DestroyInstanceHandler.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -19,13 +19,8 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; -import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.ui.views.CVCloudElement; -import org.jboss.tools.deltacloud.ui.views.CVInstanceElement; import org.jboss.tools.deltacloud.ui.views.CVMessages; -import org.jboss.tools.deltacloud.ui.views.CloudViewElement; -import org.jboss.tools.deltacloud.ui.views.CloudViewElementUtils; import org.jboss.tools.deltacloud.ui.views.PerformDestroyInstanceActionThread; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; @@ -45,7 +40,7 @@ ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { if (isSingleInstanceSelected(selection)) { - CVInstanceElement cvInstance = UIUtils.getFirstElement(selection, CVInstanceElement.class); + DeltaCloudInstance cvInstance = UIUtils.getFirstElement(selection, DeltaCloudInstance.class); destroyInstance(cvInstance); } else { destroyWithDialog((IStructuredSelection) selection); @@ -57,9 +52,9 @@ @SuppressWarnings("unchecked") private void destroyWithDialog(IStructuredSelection selection) { - CVInstanceElementsSelectionDialog dialog = new CVInstanceElementsSelectionDialog( + DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog( UIUtils.getActiveShell() - , (List<CVInstanceElement>) selection.toList() + , (List<DeltaCloudInstance>) selection.toList() , CVMessages.getString(DESTROY_INSTANCE_TITLE) , CVMessages.getString(DESTROY_INSTANCE_MSG)); if (Dialog.OK == dialog.open()) { @@ -69,18 +64,14 @@ private void destroyInstances(Object[] cvInstances) { for (int i = 0; i < cvInstances.length; i++) { - destroyInstance((CVInstanceElement) cvInstances[i]); + destroyInstance((DeltaCloudInstance) cvInstances[i]); } } - private void destroyInstance(CVInstanceElement cvInstance) { - if (cvInstance != null) { - DeltaCloudInstance instance = (DeltaCloudInstance) cvInstance.getElement(); - CloudViewElement element = cvInstance; - CVCloudElement cvcloud = CloudViewElementUtils.getCVCloudElement(element); - DeltaCloud cloud = (DeltaCloud) cvcloud.getElement(); + private void destroyInstance(DeltaCloudInstance instance) { + if (instance != null) { PerformDestroyInstanceActionThread t = new PerformDestroyInstanceActionThread( - cloud, + instance.getDeltaCloud(), instance, CVMessages.getString(DESTROYING_INSTANCE_TITLE), CVMessages.getFormattedString(DESTROYING_INSTANCE_MSG, new String[] { instance.getName() })); Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java (from rev 26391, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstanceStoppedPropertyTester.java) =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.deltacloud.ui.commands; + +import org.eclipse.core.expressions.PropertyTester; +import org.eclipse.core.runtime.Assert; +import org.jboss.tools.deltacloud.core.DeltaCloudInstance; +import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; + +/** + * A property tester for the command framework that answers if the given + * instance is stopped + * + * @author Andre Dietisheim + */ +public class InstancePropertyTester extends PropertyTester { + + private static final String PROPERTY_STATE_STOPPED = "isStopped"; + + @Override + public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { + DeltaCloudInstance instance = UIUtils.adapt(receiver, DeltaCloudInstance.class); + if (instance == null) { + return false; + } + if (PROPERTY_STATE_STOPPED.equals(property)) { + return isStopped(instance, expectedValue); + } + return false; + } + + private boolean isStopped(DeltaCloudInstance instance, Object expectedValue) { + Assert.isTrue(expectedValue instanceof Boolean); + Boolean expectedBoolean = (Boolean) expectedValue; + Object propertyValue = instance.isStopped(); + return expectedBoolean.equals(propertyValue); + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstanceStoppedPropertyTester.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstanceStoppedPropertyTester.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstanceStoppedPropertyTester.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -1,36 +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.ui.commands; - -import org.eclipse.core.expressions.PropertyTester; -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IAdaptable; -import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.core.client.Instance.State; - -/** - * A property tester for the command framework that answers if the given - * instance is stopped - * - * @author Andre Dietisheim - */ -public class InstanceStoppedPropertyTester extends PropertyTester { - - @Override - public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { - Assert.isTrue(receiver instanceof IAdaptable); - DeltaCloudInstance instance = (DeltaCloudInstance) ((IAdaptable) receiver).getAdapter(DeltaCloudInstance.class); - Assert.isTrue(expectedValue instanceof Boolean); - Boolean isExpectedValue = (Boolean) expectedValue; - boolean isStopped = State.STOPPED.toString().equals(instance.getState()); - return isExpectedValue.equals(isStopped); - } -} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/RebootInstanceHandler.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -20,7 +20,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.ui.views.CVInstanceElement; import org.jboss.tools.deltacloud.ui.views.CVMessages; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; @@ -40,7 +39,7 @@ ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { if (isSingleInstanceSelected(selection)) { - CVInstanceElement cvInstance = UIUtils.getFirstElement(selection, CVInstanceElement.class); + DeltaCloudInstance cvInstance = UIUtils.getFirstElement(selection, DeltaCloudInstance.class); rebootInstance(cvInstance); } else { rebootWithDialog((IStructuredSelection)selection); @@ -52,9 +51,9 @@ @SuppressWarnings("unchecked") private void rebootWithDialog(IStructuredSelection selection) { - CVInstanceElementsSelectionDialog dialog = new CVInstanceElementsSelectionDialog( + DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog( UIUtils.getActiveShell() - , (List<CVInstanceElement>) selection.toList() + , (List<DeltaCloudInstance>) selection.toList() , CVMessages.getString(REBOOT_INSTANCE_TITLE) , CVMessages.getString(REBOOT_INSTANCE_MSG)); if (Dialog.OK == dialog.open()) { @@ -62,17 +61,16 @@ } } - private void rebootInstances(Object[] cvInstances) { - for (int i = 0; i < cvInstances.length; i++) { - rebootInstance((CVInstanceElement) cvInstances[i]); + private void rebootInstances(Object[] deltaCloudInstances) { + for (int i = 0; i < deltaCloudInstances.length; i++) { + rebootInstance((DeltaCloudInstance) deltaCloudInstances[i]); } } - private void rebootInstance(CVInstanceElement cvInstance) { - if (cvInstance != null) { - DeltaCloudInstance instance = (DeltaCloudInstance) cvInstance.getElement(); + private void rebootInstance(DeltaCloudInstance instance) { + if (instance != null) { executeInstanceAction( - cvInstance + instance , DeltaCloudInstance.REBOOT , DeltaCloudInstance.RUNNING , CVMessages.getString(REBOOTING_INSTANCE_TITLE) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StartInstanceHandler.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -14,13 +14,13 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.ui.views.CVInstanceElement; import org.jboss.tools.deltacloud.ui.views.CVMessages; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; @@ -39,7 +39,7 @@ ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { if (isSingleInstanceSelected(selection)) { - CVInstanceElement cvinstance = UIUtils.getFirstElement(selection, CVInstanceElement.class); + DeltaCloudInstance cvinstance = UIUtils.getFirstElement(selection, DeltaCloudInstance.class); startInstance(cvinstance); } else { startWithDialog((IStructuredSelection) selection); @@ -51,9 +51,9 @@ @SuppressWarnings("unchecked") private void startWithDialog(IStructuredSelection selection) { - CVInstanceElementsSelectionDialog dialog = new CVInstanceElementsSelectionDialog( + DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog( UIUtils.getActiveShell() - , (List<CVInstanceElement>) selection.toList() + , (List<DeltaCloudInstance>) selection.toList() , CVMessages.getString(START_INSTANCES_DIALOG_TITLE) , CVMessages.getString(START_INSTANCES_DIALOG_MSG)); if (Dialog.OK == dialog.open()) { @@ -61,17 +61,17 @@ } } - private void startInstances(Object[] cvInstances) { - for (int i = 0; i < cvInstances.length; i++) { - startInstance((CVInstanceElement) cvInstances[i]); + private void startInstances(Object[] deltaCloudInstances) { + for (int i = 0; i < deltaCloudInstances.length; i++) { + Assert.isTrue(deltaCloudInstances[i] instanceof DeltaCloudInstance); + startInstance((DeltaCloudInstance) deltaCloudInstances[i]); } } - private void startInstance(CVInstanceElement cvInstance) { - if (cvInstance != null) { - DeltaCloudInstance instance = (DeltaCloudInstance) cvInstance.getElement(); + private void startInstance(DeltaCloudInstance instance) { + if (instance != null) { executeInstanceAction( - cvInstance + instance , DeltaCloudInstance.START , DeltaCloudInstance.RUNNING , CVMessages.getString(STARTING_INSTANCE_TITLE) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/StopInstanceHandler.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -20,7 +20,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; import org.jboss.tools.deltacloud.core.DeltaCloudInstance; -import org.jboss.tools.deltacloud.ui.views.CVInstanceElement; import org.jboss.tools.deltacloud.ui.views.CVMessages; import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils; @@ -39,7 +38,7 @@ ISelection selection = HandlerUtil.getCurrentSelection(event); if (selection instanceof IStructuredSelection) { if (isSingleInstanceSelected(selection)) { - CVInstanceElement cvInstance = UIUtils.getFirstElement(selection, CVInstanceElement.class); + DeltaCloudInstance cvInstance = UIUtils.getFirstElement(selection, DeltaCloudInstance.class); stopInstance(cvInstance); } else { stopWithDialog((IStructuredSelection) selection); @@ -51,9 +50,9 @@ @SuppressWarnings("unchecked") private void stopWithDialog(IStructuredSelection selection) { - CVInstanceElementsSelectionDialog dialog = new CVInstanceElementsSelectionDialog( + DeltaCloudInstanceDialog dialog = new DeltaCloudInstanceDialog( UIUtils.getActiveShell() - , (List<CVInstanceElement>) selection.toList() + , (List<DeltaCloudInstance>) selection.toList() , CVMessages.getString(STOP_INSTANCES_DIALOG_TITLE) , CVMessages.getString(STOP_INSTANCES_DIALOG_MSG)); if (Dialog.OK == dialog.open()) { @@ -61,17 +60,16 @@ } } - private void stopInstances(Object[] cvInstances) { - for (int i = 0; i < cvInstances.length; i++) { - stopInstance((CVInstanceElement) cvInstances[i]); + private void stopInstances(Object[] deltaCloudInstances) { + for (int i = 0; i < deltaCloudInstances.length; i++) { + stopInstance((DeltaCloudInstance) deltaCloudInstances[i]); } } - private void stopInstance(CVInstanceElement cvInstance) { - if (cvInstance != null) { - DeltaCloudInstance instance = (DeltaCloudInstance) cvInstance.getElement(); + private void stopInstance(DeltaCloudInstance instance) { + if (instance != null) { executeInstanceAction( - cvInstance + instance , DeltaCloudInstance.STOP , DeltaCloudInstance.STOPPED , CVMessages.getString(STOPPING_INSTANCE_TITLE) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstanceElement.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -28,12 +28,10 @@ @Override public Object getAdapter(Class adapter) { System.err.println("CVInstanceElement#getAdapter: adapter = " + adapter); - Object adapted = super.getAdapter(adapter); - if (adapted == null && adapter == DeltaCloudInstance.class) { - adapted = getElement(); + if (adapter == DeltaCloudInstance.class) { + return getElement(); } - - return adapted; - } + return super.getAdapter(adapter); + } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2010-11-11 14:15:50 UTC (rev 26450) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/UIUtils.java 2010-11-11 14:42:30 UTC (rev 26451) @@ -11,6 +11,8 @@ package org.jboss.tools.internal.deltacloud.ui.utils; import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.Platform; import org.eclipse.jface.action.ContributionManager; import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.IContributionManager; @@ -71,7 +73,9 @@ } /** - * Gets the first element. + * Gets the first element of a given selection in the given type. Returns + * <code>null</null> if selection is selection is empty or adaption of the first element in + * the given selection fails. Adaption is tried by casting and by adapting it. * * @param selection * the selection @@ -80,18 +84,16 @@ * * @return the first element */ - @SuppressWarnings("unchecked") public static <T> T getFirstElement(final ISelection selection, final Class<T> expectedClass) { if (selection == null) { return null; } else { Assert.isTrue(selection instanceof IStructuredSelection); Object firstElement = ((IStructuredSelection) selection).getFirstElement(); - if (firstElement != null && expectedClass.isAssignableFrom(firstElement.getClass())) { - return (T) firstElement; - } else { + if (firstElement == null) { return null; } + return adapt(firstElement, expectedClass); } } @@ -116,6 +118,28 @@ } /** + * Adapts the given object to the given type. Returns <code>null</code> if + * the given adaption is not possible. Adaption is tried by casting and by adapting it. + * + * @param <T> + * @param object + * @param expectedClass + * @return + */ + @SuppressWarnings("unchecked") + public static <T> T adapt(Object object, Class<T> expectedClass) { + if (object == null) { + return null; + } else if (expectedClass.isAssignableFrom(object.getClass())) { + return (T) object; + } else if (object instanceof IAdaptable) { + return (T) ((IAdaptable) object).getAdapter(expectedClass); + } else { + return (T) Platform.getAdapterManager().loadAdapter(object, expectedClass.getName()); + } + } + + /** * Gets the active page. * * @return the active page