Author: adietish Date: 2010-12-24 19:07:01 -0500 (Fri, 24 Dec 2010) New Revision: 27733 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java Removed: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java Log: [JBIDE-8000] switched to observable pojo that notifies in UI thread only, corrected binding order (first bind items, then selected item, then enablement) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-24 23:45:38 UTC (rev 27732) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-25 00:07:01 UTC (rev 27733) @@ -1,3 +1,12 @@ +2010-12-25 adietisheim <adietisheim@adietisheim-thinkpad> + + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java: + [JBIDE-8000] switched to observable pojo that notifies in UI thread only + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java + (bindRealmCombo): + (bindProfileCombo): + [JBIDE-8000] corrected binding order (first bind items, then selected item, then enablement) + 2010-12-23 adietisheim <adietisheim@adietisheim-thinkpad> * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java: 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-24 23:45:38 UTC (rev 27732) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2010-12-25 00:07:01 UTC (rev 27733) @@ -6,12 +6,12 @@ <booleanAttribute key="automaticValidate" value="false"/> <stringAttribute key="bootstrap" value=""/> <stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="false"/> +<booleanAttribute key="clearConfig" value="true"/> <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.jboss.ide.eclipse.as.wtp.ui,org.jboss.tools.ui.bot.ext,org.jboss.tools.common.projecttemplates,org.jboss.ide.eclipse.as.rse.core,org.jboss.tools.tests.performance,org.jboss.tools.common.el.core,org.jboss.ide.eclipse.as.ui.mbeans,org.jboss.tools.common.gef,org.jboss.ide.eclipse.as.archives.integration.test,org.jboss.tools.common.verification.test,org.jboss.ide.eclipse.archives.core,org.jboss.tools.common.verification,org.jboss.ide.eclipse.archives.jdt.integration,org.jboss.tools.jmx.core.test,org.jboss.tools.common.model,org.jboss.ide.eclipse.as.classpath.core,org.jboss.ide.eclipse.archives.test,org.jboss.ide.eclipse.as.classpath.ui,org.jboss.tools.common.ui,org.jboss.tools.common.text.ext,org.jboss.tools.jmx.ui,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jboss.tools.common.text.xml,org.jboss.ide.eclipse.as.ui.test,org.jboss.to! ols.common.meta.ui,org.jboss.ide.eclipse.archives.webtools,org.jboss.tools.deltacloud.docs,org.jboss.ide.eclipse.as.rse.ui,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.verification.ui,org.jboss.tools.common.test,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.ide.eclipse.archives.ui,org.jboss.tools.common.el.ui,org.jboss.ide.eclipse.as.test,org.jboss.tools.deltacloud.test,org.jboss.tools.jmx.ui.test,org.jboss.ide.eclipse.as.ssh,org.jboss.tools.common.resref.ui,org.jboss.ide.eclipse.as.ui,org.jboss.ide.eclipse.archives.ui.test,org.jboss.ide.eclipse.as.doc.user,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/> +<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.ui.bot.ext,org.jboss.tools.common.projecttemplates,org.jboss.tools.tests.performance,org.jboss.tools.common.el.core,org.jboss.ide.eclipse.as.ui.mbeans,org.jboss.tools.common.gef,org.jboss.ide.eclipse.as.archives.integration.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.ide.eclipse.archives.jdt.integration,org.jboss.tools.jmx.core.test,org.jboss.tools.common.model,org.jboss.ide.eclipse.as.classpath.core,org.jboss.ide.eclipse.archives.test,org.jboss.ide.eclipse.as.classpath.ui,org.jboss.tools.common.ui,org.jboss.tools.common.text.ext,org.jboss.tools.ui.bot.ext.test,org.jboss.tools.common.el.core.test,org.jboss.tools.common.model.ui.test,org.jboss.tools.tests,org.jboss.tools.common.text.xml,org.jboss.ide.eclipse.as.ui.test,org.jboss.tools.common.meta.ui,org.jboss.tools.deltacloud.docs,org.jboss.ide.eclipse.as.rse.ui,org.jboss.tools.common.verification.ui.tes! t,org.jboss.tools.common.verification.ui,org.jboss.tools.common.test,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.jboss.ide.eclipse.as.test,org.jboss.tools.common.el.ui,org.jboss.tools.deltacloud.test,org.jboss.tools.jmx.ui.test,org.jboss.ide.eclipse.as.ssh,org.jboss.tools.common.resref.ui,org.jboss.ide.eclipse.archives.ui.test,org.jboss.ide.eclipse.as.doc.user,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/> <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../runtime-deltacloud"/> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> @@ -24,8 +24,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.rse.services@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.sdk@default:default,org.eclipse.jem.beaninfo@default:default,org.eclipse.compare@default:default,org.eclipse.compare.core@default:default,org.eclipse.equinox.p2.director@default:default,org.apache.commons.el@default:default,org.eclipse.wst.web@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.jem.beaninfo.vm@default:default,org.eclipse.pde.build@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.search@default:default,org.apache.lucene.analysis@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@def! ault:default,org.eclipse.jem.beaninfo.vm.common@default:default,org.eclipse.osgi@-1:true,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.core.jobs@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.pde.core@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.editors@default:default,org.eclipse.debug.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jst.j2ee.jca@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ui.wor! kbench@default:default,org.eclipse.ui.console@default:default,! org.ecli pse.core.expressions@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.debug.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.help@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.jst.common.project.facet.core@default:default,javax.servlet.jsp@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.core.databinding@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.core.resources@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jface.databinding@de! fault:default,javax.servlet@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jface.text@default:default,org.mortbay.jetty.server@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.variables@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.osgi.services@default:default,org.eclipse.text@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.apache.lucene@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.ecf@default:default,org.eclipse.team.core@default:default,org.eclipse.emf.ecore.change! @default:default,org.eclipse.jem@default:default,org.sat4j.cor! e@defaul t:default,org.eclipse.jst.server.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.apache.xml.serializer@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.jst.jee@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,org.eclipse.jem.util@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.junit4@default:default,org.apache.ant@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.equinox.security@! default:default,org.eclipse.core.commands@default:default,org.eclipse.update.core@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.net@default:default,org.apache.jasper@default:default,org.eclipse.rse.core@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jface@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.core.runtime@default:true,org.eclipse.swt@default:default,javax.xml@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.wst.xml.core@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jdt.core@default:default,org.eclipse.help.base@default:default,org.eclipse.ui@def! ault:default,com.ibm.icu@default:default,org.apache.xerces@def! ault:def ault,org.eclipse.emf.common@default:default,org.eclipse.jst.common.frameworks@default:default,org.apache.xml.resolver@default:default,org.eclipse.platform@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.help.ui@default:default,org.mortbay.jetty.util@default:default,org.eclipse.core.filebuffers@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.jdt.core.manipulation@default:default,org.sat4j.pb@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.jem.proxy@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.security.ui@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.jboss.ide.eclipse.as.core@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.tools.common@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.core@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.apache.xml.resolver@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.apache.xerces@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt@default:default,org.eclipse.platform@default:default,org.eclipse.ui.browser@default:default,org.eclipse.core! .net.linux.x86_64@default:false,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jface.databinding@default:default,org.eclipse.rse.connectorservice.local@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.equinox.security@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.rse.ui@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.pde.core@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.jem.beaninfo@default:default,org.apache.lucene.analysis@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox! .app@default:default,org.eclipse.jst.j2ee.ejb.annotation.model! @default :default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.equinox.p2.director@default:default,org.mortbay.jetty.server@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.text@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.emf.edit@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,javax.servlet.jsp@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.dstore.extra@default:default,org.! eclipse.ui.workbench@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,javax.xml@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.junit4@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.jst.j2ee.jca@default:default,org.apache.xml.serializer@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.sdk@default:default,org.eclipse.pde.build@default:default,org.eclipse.help@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jem.beaninfo.vm@default:default,org.apache.commons.net@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.osgi.util@default:default,com.i! bm.icu@default:default,org.eclipse.ui.editors@default:default,! org.ecli pse.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.rse.services.telnet@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.wst.server.ui.infopop@default:default,org.apache.ant@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.expressions@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.forms@default:default,org.eclipse.core.runtime@default! :true,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.osgi.services@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.compare.core@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.ant.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.search@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.ide@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equ! inox.simpleconfigurator@1:true,org.eclipse.wst.server.ui.doc.u! ser@defa ult:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.ecf.identity@default:default,org.eclipse.jst.server.core@default:default,org.hamcrest.core@default:default,org.eclipse.rse.useractions@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.osgi@-1:true,org.eclipse.rse.core@default:default,org.eclipse.jface@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.rse.connectorservice.dstore@default:default,org.eclipse.swt@default:default,org.eclipse.emf.common@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equinox.p2.publisher@default:default,com.jcraft.jsch@default:default,org.eclipse.core.jobs@default:default,org.apache.jasper@default:default,org.eclipse.help.base@default:default,org.eclipse! .rse.services.dstore@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.resources@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.wst.web@default:default,org.eclipse.jsch.core@default:default,org.sat4j.core@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.core.runtime.compatibility@default:default,javax.servlet@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.equinox.p2.operations@d! efault:default,org.eclipse.rse.subsystems.terminals.ssh@defaul! t:defaul t,org.eclipse.jst.common.ui@default:default,org.eclipse.rse.subsystems.terminals.core@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jst.j2ee.web@default:default,org.sat4j.pb@default:default,org.eclipse.dstore.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.server.discovery@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.variables@default:default,org.eclipse.jem@default:default,org.eclipse.jem.util@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jst.j2ee.jca.ui@default:default,org.mortbay.jetty.util@d! efault:default,org.eclipse.equinox.common@2:true,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.eclipse.jem.beaninfo.vm.common@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.intro@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.apache.lucene@default:default,org.eclipse.core.net@default:default,org.eclipse.update.core@default:default,org.eclipse.jst.jee@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.ecf@default:default,org.eclipse.update.configurator@3:true,org.eclipse.rse.services@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.equinox.p2.ja! rprocessor@default:default,org.eclipse.rse.terminals.ui@defaul! t:defaul t,org.eclipse.emf.codegen@default:default,org.eclipse.core.filesystem@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.tools.common@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.ide.eclipse.as.core@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/> <booleanAttribute key="tracing" value="false"/> Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java 2010-12-24 23:45:38 UTC (rev 27732) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java 2010-12-25 00:07:01 UTC (rev 27733) @@ -1,253 +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.internal.deltacloud.ui.wizards; - -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.jboss.tools.common.log.StatusFactory; -import org.jboss.tools.deltacloud.core.DeltaCloud; -import org.jboss.tools.deltacloud.core.DeltaCloudException; -import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile; -import org.jboss.tools.deltacloud.core.DeltaCloudImage; -import org.jboss.tools.deltacloud.core.DeltaCloudRealm; -import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob; -import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT; -import org.jboss.tools.deltacloud.ui.Activator; -import org.jboss.tools.internal.deltacloud.core.observable.ObservablePojo; - -/** - * @author Jeff Jonhston - * @author André Dietisheim - */ -public class NewInstanceModel extends ObservablePojo { - - public static final String PROPERTY_URL = "url"; //$NON-NLS-1$ - public static final String PROPERTY_NAME = "name"; //$NON-NLS-1$ - public static final String PROPERTY_IMAGE = "image"; //$NON-NLS-1$ - public static final String PROPERTY_ARCH = "arch"; //$NON-NLS-1$ - public static final String PROPERTY_REALMS = "realms"; //$NON-NLS-1$ - public static final String PROPERTY_SELECTED_REALM_INDEX = "selectedRealmIndex"; //$NON-NLS-1$ - public static final String PROPERTY_KEYNAME = "keyname"; //$NON-NLS-1$ - public static final String PROPERTY_PROFILE = "profile"; //$NON-NLS-1$ - public static final String PROPERTY_ALL_PROFILES = "allProfiles"; //$NON-NLS-1$ - public static final String PROPERTY_FILTERED_PROFILES = "filteredProfiles"; //$NON-NLS-1$ - public static final String PROPERTY_SELECTED_PROFILE_INDEX = "selectedProfileIndex"; //$NON-NLS-1$ - - private String name; - private DeltaCloudImage image; - private String arch; - private String keyname; - private DeltaCloud cloud; - private DeltaCloudRealm selectedRealm; - private List<DeltaCloudRealm> realms = new ArrayList<DeltaCloudRealm>(); - private DeltaCloudHardwareProfile selectedProfile; - private List<DeltaCloudHardwareProfile> allProfiles = new ArrayList<DeltaCloudHardwareProfile>(); - private List<DeltaCloudHardwareProfile> filteredProfiles = new ArrayList<DeltaCloudHardwareProfile>(); - private String cpu; - private String storage; - private String memory; - - protected NewInstanceModel(DeltaCloud cloud, String keyname, DeltaCloudImage image) { - this.cloud = cloud; - this.keyname = keyname; - this.image = image; - asyncGetRealms(); - asyncGetProfiles(); - } - - public String getName() { - return name; - } - - public void setName(String name) { - getPropertyChangeSupport().firePropertyChange(PROPERTY_NAME, this.name, this.name = name); - } - - public DeltaCloudImage getImage() { - return image; - } - - public void setImage(DeltaCloudImage image) { - List<DeltaCloudHardwareProfile> filteredProfiles = filterProfiles(image, allProfiles); - setFilteredProfiles(filteredProfiles); - getPropertyChangeSupport().firePropertyChange(PROPERTY_IMAGE, this.image, this.image = image); - } - - public void setSelectedRealmIndex(int index) { - if (realms.size() > index) { - DeltaCloudRealm deltaCloudRealm = realms.get(index); - setSelectedRealm(deltaCloudRealm); - firePropertyChange(PROPERTY_SELECTED_REALM_INDEX, null, index); - } - } - - public int getSelectedRealmIndex() { - return realms.indexOf(selectedRealm); - } - - public void setSelectedRealm(DeltaCloudRealm realm) { - selectedRealm = realm; - } - - public String getRealmId() { - if (selectedRealm == null) { - return null; - } - return selectedRealm.getId(); - } - - private void setRealms(List<DeltaCloudRealm> realms) { - getPropertyChangeSupport().firePropertyChange(PROPERTY_REALMS, this.realms, this.realms = realms); - } - - public List<DeltaCloudRealm> getRealms() { - return realms; - } - - private void setAllProfiles(List<DeltaCloudHardwareProfile> profiles) { - getPropertyChangeSupport().firePropertyChange(PROPERTY_ALL_PROFILES, this.allProfiles, this.allProfiles = profiles); - } - - public List<DeltaCloudHardwareProfile> getAllProfiles() { - return allProfiles; - } - - private void setFilteredProfiles(List<DeltaCloudHardwareProfile> profiles) { - getPropertyChangeSupport().firePropertyChange(PROPERTY_FILTERED_PROFILES, this.filteredProfiles, this.filteredProfiles = profiles); - } - - public List<DeltaCloudHardwareProfile> getFilteredProfiles() { - return filteredProfiles; - } - - private List<DeltaCloudHardwareProfile> filterProfiles(DeltaCloudImage image, Collection<DeltaCloudHardwareProfile> profiles) { - List<DeltaCloudHardwareProfile> filteredProfiles = new ArrayList<DeltaCloudHardwareProfile>(); - for (DeltaCloudHardwareProfile p : profiles) { - if (p.getArchitecture() == null - || image == null - || image.getArchitecture().equals(p.getArchitecture())) { - filteredProfiles.add(p); - } - } - - return filteredProfiles; - } - - public void setSelectedProfileIndex(int index) { - if (filteredProfiles.size() > index) { - DeltaCloudHardwareProfile hardwareProfile = filteredProfiles.get(index); - setSelectedProfile(hardwareProfile); - firePropertyChange(PROPERTY_SELECTED_PROFILE_INDEX, null, index); - } - } - - public int getSelectedProfileIndex() { - return filteredProfiles.indexOf(selectedProfile); - } - - public void setSelectedProfile(DeltaCloudHardwareProfile profile) { - selectedProfile = profile; - } - - public String getProfileId() { - if (selectedProfile == null) { - return null; - } - return selectedProfile.getId(); - } - - public String getKeyname() { - return keyname; - } - - public void setKeyname(String keyname) { - getPropertyChangeSupport().firePropertyChange(PROPERTY_KEYNAME, this.keyname, this.keyname = keyname); - } - - public String getArch() { - return arch; - } - - public void setArch(String arch) { - getPropertyChangeSupport().firePropertyChange(PROPERTY_ARCH, this.arch, this.arch = arch); - } - - public int getSelectedProfile() { - return allProfiles.indexOf(selectedProfile); - } - - private void asyncGetRealms() { - // TODO: internationalize strings - new AbstractCloudElementJob("Get realms", cloud, CLOUDELEMENT.REALMS) { - protected IStatus doRun(IProgressMonitor monitor) throws Exception { - try { - setRealms(Arrays.asList(cloud.getRealms())); - setSelectedRealmIndex(0); - return Status.OK_STATUS; - } catch (DeltaCloudException e) { - // TODO: internationalize strings - return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, - MessageFormat.format("Could not get realms from cloud {0}", cloud.getName())); - } - } - }.schedule(); - } - - private void asyncGetProfiles() { - // TODO: internationalize strings - new AbstractCloudElementJob("Get profiles", cloud, CLOUDELEMENT.PROFILES) { - protected IStatus doRun(IProgressMonitor monitor) throws Exception { - try { - List<DeltaCloudHardwareProfile> profiles = Arrays.asList(cloud.getProfiles()); - setAllProfiles(profiles); - setFilteredProfiles(filterProfiles(image, profiles)); - setSelectedProfileIndex(0); - return Status.OK_STATUS; - } catch (DeltaCloudException e) { - // TODO: internationalize strings - return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, - MessageFormat.format("Could not get profiles from cloud {0}", cloud.getName())); - } - } - }.schedule(); - } - - public void setCpu(String cpu) { - this.cpu = cpu; - } - - public String getCpu() { - return this.cpu; - } - - public void setMemory(String memory) { - this.memory = memory; - } - - public String getMemory() { - return this.memory; - } - - public void setStorage(String storage) { - this.storage = storage; - } - - public String getStorage() { - return this.storage; - } -} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-12-24 23:45:38 UTC (rev 27732) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-12-25 00:07:01 UTC (rev 27733) @@ -90,7 +90,7 @@ private static final String IMAGE_ID_NOT_FOUND = "ErrorImageIdNotFound.text"; //$NON-NLS-1$ private Composite container; - private NewInstanceModel model; + private NewInstancePageModel model; private DeltaCloud cloud; private Label arch; private Text nameText; @@ -138,7 +138,7 @@ super(WizardMessages.getString(NAME)); this.cloud = cloud; String defaultKeyname = cloud.getLastKeyname(); - model = new NewInstanceModel(cloud, defaultKeyname, image); //$NON-NLS-1$ + model = new NewInstancePageModel(cloud, defaultKeyname, image); //$NON-NLS-1$ setDescription(WizardMessages.getString(DESCRIPTION)); setTitle(WizardMessages.getString(TITLE)); setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE); @@ -219,7 +219,7 @@ private void bindWidgets(DataBindingContext dbc, Composite container) { // name - bindText(nameText, NewInstanceModel.PROPERTY_NAME, WizardMessages.getString(MUST_ENTER_A_NAME), dbc); + bindText(nameText, NewInstancePageModel.PROPERTY_NAME, WizardMessages.getString(MUST_ENTER_A_NAME), dbc); // image IObservableValue imageObservable = bindImage(imageText, dbc); // arch label @@ -228,7 +228,7 @@ bindProfileCombo(hardwareCombo, dbc); bindProfilePages(hardwareCombo, profilePages, dbc); // key - bindText(keyText, NewInstanceModel.PROPERTY_KEYNAME, WizardMessages.getString(MUST_ENTER_A_KEYNAME), dbc); + bindText(keyText, NewInstancePageModel.PROPERTY_KEYNAME, WizardMessages.getString(MUST_ENTER_A_KEYNAME), dbc); } private void bindArchLabel(IObservableValue imageObservable, DataBindingContext dbc) { @@ -251,19 +251,27 @@ } private void bindRealmCombo(final Combo realmCombo, DataBindingContext dbc) { - // realm combo enablement - IObservableList realmsObservable = BeanProperties.list(NewInstanceModel.PROPERTY_REALMS).observe(model); - DataBindingUtils.addChangeListener(new IChangeListener() { + dbc.bindList(WidgetProperties.items().observe(realmCombo), + BeanProperties.list(NewInstancePageModel.PROPERTY_REALMS).observe(model), + new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER), + new UpdateListStrategy().setConverter( + new Converter(Object.class, String.class) { - @Override - public void handleChange(ChangeEvent event) { - realmCombo.setEnabled(areRealmsAvailable()); - } - }, realmsObservable, container); + @Override + public Object convert(Object fromObject) { + Assert.isTrue(fromObject instanceof DeltaCloudRealm); + DeltaCloudRealm realm = (DeltaCloudRealm) fromObject; + return new StringBuilder() + .append(realm.getId()) + .append(" [").append(realm.getName()).append("]") //$NON-NLS-1$ $NON-NLS-2$ + .toString(); + } + } + )); Binding selectedRealmBinding = dbc.bindValue( WidgetProperties.singleSelectionIndex().observe(realmCombo), - BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_SELECTED_REALM_INDEX) + BeanProperties.value(NewInstancePageModel.class, NewInstancePageModel.PROPERTY_SELECTED_REALM_INDEX) .observe(model), new UpdateValueStrategy() .setAfterGetValidator(new IValidator() { @@ -290,51 +298,49 @@ } })); - dbc.bindList(WidgetProperties.items().observe(realmCombo), - BeanProperties.list(NewInstanceModel.PROPERTY_REALMS).observe(model), + // realm combo enablement + IObservableList realmsObservable = BeanProperties.list(NewInstancePageModel.PROPERTY_REALMS).observe(model); + DataBindingUtils.addChangeListener(new IChangeListener() { + + @Override + public void handleChange(ChangeEvent event) { + realmCombo.setEnabled(areRealmsAvailable()); + } + }, realmsObservable, container); + + ControlDecorationSupport.create(selectedRealmBinding, SWT.LEFT | SWT.TOP); + } + + private void bindProfileCombo(final Combo profileCombo, DataBindingContext dbc) { + // bind combo items + dbc.bindList(WidgetProperties.items().observe(profileCombo), + BeanProperties.list(NewInstancePageModel.PROPERTY_FILTERED_PROFILES).observe(model), new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER), new UpdateListStrategy().setConverter( new Converter(Object.class, String.class) { @Override public Object convert(Object fromObject) { - Assert.isTrue(fromObject instanceof DeltaCloudRealm); - DeltaCloudRealm realm = (DeltaCloudRealm) fromObject; - return new StringBuilder() - .append(realm.getId()) - .append(" [").append(realm.getName()).append("]") //$NON-NLS-1$ $NON-NLS-2$ - .toString(); + Assert.isTrue(fromObject instanceof DeltaCloudHardwareProfile); + DeltaCloudHardwareProfile profile = (DeltaCloudHardwareProfile) fromObject; + return profile.getId(); } } )); - ControlDecorationSupport.create(selectedRealmBinding, SWT.LEFT | SWT.TOP); - } - private void bindProfileCombo(final Combo profileCombo, DataBindingContext dbc) { - // bind combo enablement - IObservableList filteredProfilesObservable = - BeanProperties.list(NewInstanceModel.PROPERTY_FILTERED_PROFILES).observe(model); - DataBindingUtils.addChangeListener( - new IChangeListener() { - - @Override - public void handleChange(ChangeEvent event) { - profileCombo.setEnabled(areProfilesAvailable()); - } - }, filteredProfilesObservable, container); - // bind selected combo item Binding selectedProfileBinding = dbc.bindValue( WidgetProperties.singleSelectionIndex().observe(profileCombo), - BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_SELECTED_PROFILE_INDEX).observe( - model), + BeanProperties.value(NewInstancePageModel.class, NewInstancePageModel.PROPERTY_SELECTED_PROFILE_INDEX) + .observe( + model), new UpdateValueStrategy() .setAfterGetValidator(new IValidator() { @Override public IStatus validate(Object value) { - if (areProfilesAvailable() && - !isValidComboIndex(value)) { + if (// areProfilesAvailable() && + !isValidComboIndex(value)) { // TODO: internationalize strings return ValidationStatus.error("You must select a hardware profile."); } @@ -346,38 +352,37 @@ @Override public IStatus validate(Object value) { - if (value == null) { + if (isValidComboIndex(value)) { ValidationStatus.error("You must select a hardware profile"); } return ValidationStatus.ok(); } })); - // bind combo items - dbc.bindList(WidgetProperties.items().observe(profileCombo), - BeanProperties.list(NewInstanceModel.PROPERTY_FILTERED_PROFILES).observe(model), - new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER), - new UpdateListStrategy().setConverter( - new Converter(Object.class, String.class) { + // bind combo enablement + IObservableList filteredProfilesObservable = + BeanProperties.list(NewInstancePageModel.PROPERTY_FILTERED_PROFILES).observe(model); + DataBindingUtils.addChangeListener( + new IChangeListener() { - @Override - public Object convert(Object fromObject) { - Assert.isTrue(fromObject instanceof DeltaCloudHardwareProfile); - DeltaCloudHardwareProfile profile = (DeltaCloudHardwareProfile) fromObject; - return profile.getId(); - } - } - )); + @Override + public void handleChange(ChangeEvent event) { + profileCombo.setEnabled(areProfilesAvailable()); + } + }, filteredProfilesObservable, container); + ControlDecorationSupport.create(selectedProfileBinding, SWT.LEFT | SWT.TOP); } private boolean isValidComboIndex(Object index) { return index != null && index instanceof Integer - && ((Integer) index) > 0; + && ((Integer) index) >= 0; } private boolean areProfilesAvailable() { + System.err.println("NewInstancePage#areProfilesAvailable" + model.getFilteredProfiles() != null + && model.getFilteredProfiles().size() > 0); return model.getFilteredProfiles() != null && model.getFilteredProfiles().size() > 0; } @@ -391,7 +396,8 @@ DataBindingContext dbc) { // bind all profiles IObservable allProfilesObservable = - BeanProperties.list(NewInstanceModel.class, NewInstanceModel.PROPERTY_ALL_PROFILES).observe(model); + BeanProperties.list(NewInstancePageModel.class, NewInstancePageModel.PROPERTY_ALL_PROFILES).observe( + model); DataBindingUtils.addChangeListener(new IChangeListener() { @Override @@ -402,8 +408,9 @@ // bind selected profile IObservableValue selectedProfileIndexObservable = - BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_SELECTED_PROFILE_INDEX).observe( - model); + BeanProperties.value(NewInstancePageModel.class, NewInstancePageModel.PROPERTY_SELECTED_PROFILE_INDEX) + .observe( + model); DataBindingUtils.addChangeListener(new IChangeListener() { @Override @@ -439,7 +446,7 @@ private void bindText(Text text, String property, String errorMessage, DataBindingContext dbc) { Binding textBinding = dbc.bindValue( WidgetProperties.text(SWT.Modify).observe(text), - BeanProperties.value(NewInstanceModel.class, property).observe(model), + BeanProperties.value(NewInstancePageModel.class, property).observe(model), new UpdateValueStrategy().setBeforeSetValidator( new MandatoryStringValidator(errorMessage)), null); @@ -459,7 +466,7 @@ Binding imageBinding = dbc.bindValue( WidgetProperties.text(SWT.Modify).observeDelayed(IMAGE_CHECK_DELAY, imageText), - BeanProperties.value(NewInstanceModel.class, NewInstanceModel.PROPERTY_IMAGE).observe(model), + BeanProperties.value(NewInstancePageModel.class, NewInstancePageModel.PROPERTY_IMAGE).observe(model), widgetToModelUpdateStrategy, modelToTextUpdateStrategy); ControlDecorationSupport.create(imageBinding, SWT.LEFT | SWT.TOP); @@ -528,7 +535,7 @@ } } - public NewInstanceModel getModel() { + public NewInstancePageModel getModel() { return model; } } Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java (from rev 27687, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java) =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java 2010-12-25 00:07:01 UTC (rev 27733) @@ -0,0 +1,263 @@ +/******************************************************************************* + * 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.internal.deltacloud.ui.wizards; + +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.jboss.tools.common.log.StatusFactory; +import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudException; +import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile; +import org.jboss.tools.deltacloud.core.DeltaCloudImage; +import org.jboss.tools.deltacloud.core.DeltaCloudRealm; +import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob; +import org.jboss.tools.deltacloud.core.job.AbstractCloudElementJob.CLOUDELEMENT; +import org.jboss.tools.deltacloud.ui.Activator; +import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.ObservableUIPojo; + +/** + * @author Jeff Jonhston + * @author André Dietisheim + */ +public class NewInstancePageModel extends ObservableUIPojo { + + public static final String PROPERTY_URL = "url"; //$NON-NLS-1$ + public static final String PROPERTY_NAME = "name"; //$NON-NLS-1$ + public static final String PROPERTY_IMAGE = "image"; //$NON-NLS-1$ + public static final String PROPERTY_ARCH = "arch"; //$NON-NLS-1$ + public static final String PROPERTY_REALMS = "realms"; //$NON-NLS-1$ + public static final String PROPERTY_SELECTED_REALM_INDEX = "selectedRealmIndex"; //$NON-NLS-1$ + public static final String PROPERTY_KEYNAME = "keyname"; //$NON-NLS-1$ + public static final String PROPERTY_PROFILE = "profile"; //$NON-NLS-1$ + public static final String PROPERTY_ALL_PROFILES = "allProfiles"; //$NON-NLS-1$ + public static final String PROPERTY_FILTERED_PROFILES = "filteredProfiles"; //$NON-NLS-1$ + public static final String PROPERTY_SELECTED_PROFILE_INDEX = "selectedProfileIndex"; //$NON-NLS-1$ + + private String name; + private DeltaCloudImage image; + private String arch; + private String keyname; + private DeltaCloud cloud; + private DeltaCloudRealm selectedRealm; + private List<DeltaCloudRealm> realms = new ArrayList<DeltaCloudRealm>(); + private DeltaCloudHardwareProfile selectedProfile; + private List<DeltaCloudHardwareProfile> allProfiles = new ArrayList<DeltaCloudHardwareProfile>(); + private List<DeltaCloudHardwareProfile> filteredProfiles = new ArrayList<DeltaCloudHardwareProfile>(); + private String cpu; + private String storage; + private String memory; + + protected NewInstancePageModel(DeltaCloud cloud, String keyname, DeltaCloudImage image) { + this.cloud = cloud; + this.keyname = keyname; + this.image = image; + asyncGetRealms(); + asyncGetProfiles(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + getPropertyChangeSupport().firePropertyChange(PROPERTY_NAME, this.name, this.name = name); + } + + public DeltaCloudImage getImage() { + return image; + } + + public void setImage(DeltaCloudImage image) { + List<DeltaCloudHardwareProfile> filteredProfiles = filterProfiles(image, allProfiles); + setFilteredProfiles(filteredProfiles); + getPropertyChangeSupport().firePropertyChange(PROPERTY_IMAGE, this.image, this.image = image); + } + + public void setSelectedRealmIndex(int index) { + if (realms.size() > index) { + int oldIndex = -1; + if (selectedRealm != null + && realms.size() > 0) { + oldIndex = realms.indexOf(selectedRealm); + } + DeltaCloudRealm deltaCloudRealm = realms.get(index); + setSelectedRealm(deltaCloudRealm); + firePropertyChange(PROPERTY_SELECTED_REALM_INDEX, oldIndex, index); + } + } + + public int getSelectedRealmIndex() { + return realms.indexOf(selectedRealm); + } + + public void setSelectedRealm(DeltaCloudRealm realm) { + selectedRealm = realm; + } + + public String getRealmId() { + if (selectedRealm == null) { + return null; + } + return selectedRealm.getId(); + } + + private void setRealms(List<DeltaCloudRealm> realms) { + getPropertyChangeSupport().firePropertyChange(PROPERTY_REALMS, this.realms, this.realms = realms); + } + + public List<DeltaCloudRealm> getRealms() { + return realms; + } + + private void setAllProfiles(List<DeltaCloudHardwareProfile> profiles) { + getPropertyChangeSupport().firePropertyChange(PROPERTY_ALL_PROFILES, this.allProfiles, this.allProfiles = profiles); + } + + public List<DeltaCloudHardwareProfile> getAllProfiles() { + return allProfiles; + } + + private void setFilteredProfiles(List<DeltaCloudHardwareProfile> profiles) { + getPropertyChangeSupport().firePropertyChange(PROPERTY_FILTERED_PROFILES, this.filteredProfiles, this.filteredProfiles = profiles); + } + + public List<DeltaCloudHardwareProfile> getFilteredProfiles() { + return filteredProfiles; + } + + private List<DeltaCloudHardwareProfile> filterProfiles(DeltaCloudImage image, Collection<DeltaCloudHardwareProfile> profiles) { + List<DeltaCloudHardwareProfile> filteredProfiles = new ArrayList<DeltaCloudHardwareProfile>(); + for (DeltaCloudHardwareProfile p : profiles) { + if (p.getArchitecture() == null + || image == null + || image.getArchitecture().equals(p.getArchitecture())) { + filteredProfiles.add(p); + } + } + + return filteredProfiles; + } + + public void setSelectedProfileIndex(int index) { + if (filteredProfiles.size() > index) { + int oldIndex = -1; + if (selectedProfile != null + && filteredProfiles.size() > 0) { + oldIndex = filteredProfiles.indexOf(selectedProfile); + } + DeltaCloudHardwareProfile hardwareProfile = filteredProfiles.get(index); + setSelectedProfile(hardwareProfile); + firePropertyChange(PROPERTY_SELECTED_PROFILE_INDEX, oldIndex, index); + } + } + + public int getSelectedProfileIndex() { + return filteredProfiles.indexOf(selectedProfile); + } + + public void setSelectedProfile(DeltaCloudHardwareProfile profile) { + selectedProfile = profile; + } + + public String getProfileId() { + if (selectedProfile == null) { + return null; + } + return selectedProfile.getId(); + } + + public String getKeyname() { + return keyname; + } + + public void setKeyname(String keyname) { + getPropertyChangeSupport().firePropertyChange(PROPERTY_KEYNAME, this.keyname, this.keyname = keyname); + } + + public String getArch() { + return arch; + } + + public void setArch(String arch) { + getPropertyChangeSupport().firePropertyChange(PROPERTY_ARCH, this.arch, this.arch = arch); + } + + public int getSelectedProfile() { + return allProfiles.indexOf(selectedProfile); + } + + private void asyncGetRealms() { + // TODO: internationalize strings + new AbstractCloudElementJob("Get realms", cloud, CLOUDELEMENT.REALMS) { + protected IStatus doRun(IProgressMonitor monitor) throws Exception { + try { + setRealms(Arrays.asList(cloud.getRealms())); + setSelectedRealmIndex(0); + return Status.OK_STATUS; + } catch (DeltaCloudException e) { + // TODO: internationalize strings + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, + MessageFormat.format("Could not get realms from cloud {0}", cloud.getName())); + } + } + }.schedule(); + } + + private void asyncGetProfiles() { + // TODO: internationalize strings + new AbstractCloudElementJob("Get profiles", cloud, CLOUDELEMENT.PROFILES) { + protected IStatus doRun(IProgressMonitor monitor) throws Exception { + try { + List<DeltaCloudHardwareProfile> profiles = Arrays.asList(cloud.getProfiles()); + setAllProfiles(profiles); + setFilteredProfiles(filterProfiles(image, profiles)); + setSelectedProfileIndex(0); + return Status.OK_STATUS; + } catch (DeltaCloudException e) { + // TODO: internationalize strings + return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, + MessageFormat.format("Could not get profiles from cloud {0}", cloud.getName())); + } + } + }.schedule(); + } + + public void setCpu(String cpu) { + this.cpu = cpu; + } + + public String getCpu() { + return this.cpu; + } + + public void setMemory(String memory) { + this.memory = memory; + } + + public String getMemory() { + return this.memory; + } + + public void setStorage(String storage) { + this.storage = storage; + } + + public String getStorage() { + return this.storage; + } +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-12-24 23:45:38 UTC (rev 27732) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-12-25 00:07:01 UTC (rev 27733) @@ -76,7 +76,7 @@ @Override public boolean performFinish() { - NewInstanceModel model = mainPage.getModel(); + NewInstancePageModel model = mainPage.getModel(); DeltaCloudImage image = model.getImage(); Assert.isTrue(image != null);