Author: adietish
Date: 2010-12-27 14:53:54 -0500 (Mon, 27 Dec 2010)
New Revision: 27754
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/AbstractPreferenceValue.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringPreferenceValue.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.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/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Log:
adding/removing the key to/from the ssh preferences (Network Connections -> SSH2 ->
Private keys)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-27 19:51:30
UTC (rev 27753)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-12-27 19:53:54
UTC (rev 27754)
@@ -1,3 +1,14 @@
+2010-12-27 adietisheim <adietisheim@adietisheim-thinkpad>
+
+ * META-INF/MANIFEST.MF:
+ [JBIDE-7760] added dependency to org.eclipse.jsch.core (which holds the ssh preferences)
+ *
src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java:
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java
+ (createKey):
+ (deleteSelectedKey):
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java:
+ [JBIDE-7763] adding/removing the key to/from the ssh preferences (Network Connections
-> SSH2 -> Private keys)
+
2010-12-25 adietisheim <adietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.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-27 19:51:30 UTC (rev 27753)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud
Tools.launch 2010-12-27 19:53:54 UTC (rev 27754)
@@ -11,7 +11,7 @@
<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.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"/>
+<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.tools.jmx.core.test,org.jboss.ide.eclipse.archives.jdt.integration,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.wst.sse.core@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.rse.terminals.ui@default:default,org.eclipse.equinox.p2.operations@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.pde.core@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.ecf@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.common.modulecore@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.team.ui@default:default,org.ecl!
ipse.team.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.ssl@default:false,org.apache.lucene@default:default,org.eclipse.rse.services.telnet@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.databinding.property@default:default,org.sat4j.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.apache.commons.codec*1.3.0.v20!
100518-1140@default:default,org.eclipse.rse.connectorservice.d!
store@de
fault:default,org.apache.jasper@default:default,org.eclipse.rse.subsystems.processes.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.wst.common.emf@default:default,org.apache.commons.net@default:default,org.eclipse.platform@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jem.util@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.eclipse.equinox.app@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.common.ui@default:default,org.eclipse.emf.ecore@default:default,javax.xml@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.rse.shells.ui@default:default,org!
.eclipse.rse.processes.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.apache.xml.serializer@default:default,org.eclipse.rse.importexport@default:default,org.eclipse.rse.subsystems.processes.local@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.core.commands@default:default,org.eclipse.rse.useractions@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.wst.server.ui.infopop@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.wst.web@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclip!
se.ui.ide@default:default,org.eclipse.jdt.debug@default:defaul!
t,org.ec
lipse.update.configurator@3:true,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.pde.build@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.ui.editors@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.wst.validation@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.osgi.util@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.jst.j2ee@default:default,javax.servlet@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.jem.beaninfo.vm@default:default,o!
rg.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.rse.subsystems.files.ftp@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.rse.efs.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.osgi.services@default:default,com.ibm.icu@default:default,org.apache.lucene.analysis@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.wst.css.ui@default:default,org.apache.xml.resolver@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.equinox.p2!
.repository.tools@default:default,org.eclipse.equinox.p2.metad!
ata@defa
ult:default,org.eclipse.search@default:default,org.eclipse.rse.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.rse.connectorservice.local@default:default,javax.servlet.jsp@default:default,org.apache.ant@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.sdk@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.rse.subsystems.shells.core@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.hamcrest.core@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.jem.beaninfo@default:default,org.eclipse.core.expressions@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.ec!
lipse.jem@default:default,org.eclipse.text@default:default,org.eclipse.jsch.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.osgi@-1:true,org.eclipse.jst.common.ui@default:default,org.eclipse.help.ui@default:default,org.eclipse.rse.core@default:default,org.apache.xerces@default:default,org.eclipse.core.resources@default:default,org.eclipse.jface.text@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.rse.subsystems.terminals.core@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.jdt@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jst.jee@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.console@default:default,org.eclipse.wst.common.uriresolver@d!
efault:default,org.eclipse.rse.subsystems.files.dstore@default!
:default
,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jdt.launching@default:default,org.eclipse.ui@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.apache.commons.el@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.debug.ui@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.jface@default:default,org.eclipse.ui.views@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.emf.common@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.help.base@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.rse.dstore.security@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.wst.!
server.ui.doc.user@default:default,org.sat4j.pb@default:default,org.mortbay.jetty.util@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.compare@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.jem.beaninfo.vm.common@default:default,org.eclipse.rse.efs@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.rse.services@default:default,org.eclipse.equinox.p2.director@d!
efault:default,org.eclipse.update.core@default:default,org.ecl!
ipse.swt
@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.junit4@default:default,org.eclipse.wst.server.ui@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.dstore.core@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.rse.doc.user@default:default,org.eclipse.wst.common.project.facet.core@default:default"/>
-<stringAttribute key="selected_workspace_plugins"
value="org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.common@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default"/>
+<stringAttribute key="selected_target_plugins"
value="org.eclipse.rse.subsystems.terminals.core@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.jem.beaninfo.vm.common@default:default,org.eclipse.compare.core@default:default,org.eclipse.team.core@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.rse.connectorservice.local@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.navigator.resources@default:default,org.ec!
lipse.rse.connectorservice.ssh@default:default,org.apache.ant@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.rse.subsystems.processes.dstore@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.rse.terminals.ui@default:default,org.eclipse.platform@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jem@default:default,org.eclipse.pde.core@default:default,org.eclipse.swt.gtk.linux.x86_6!
4@default:false,org.eclipse.jem.util@default:default,org.eclip!
se.rse.u
i@default:default,org.eclipse.rse.subsystems.shells.dstore@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,com.ibm.icu@default:default,org.eclipse.rse.processes.ui@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.help@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.help.ui@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.search@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.rse.services@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.equinox.p2.ui@default:default,org.apache.xml.serializer@default:default,org.eclipse.rse.doc.user@default:default,org.eclipse.debug.ui@default:default,org.eclipse.tm.term!
inal.ssh@default:default,org.eclipse.core.variables@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.rse.subsystems.shells.local@default:default,org.eclipse.ui.intro@default:default,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.dstore.core@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.wst.validation@default:default,org.eclipse.jface.text@default:default,org.eclipse.ecf.identity@default:default,org.sat4j.core@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.update.configurator@3:true,org.eclipse.jst.server.core@default:default,org.eclipse.rse.subsystems.files.dstore@default:default,org.eclipse.compare@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.wst.server.ui.infopop@default:default,org.eclipse.rse.subsystems!
.processes.core@default:default,org.junit*4.8.1.v4_8_1_v201004!
27-1100@
default:default,org.eclipse.swt@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.pde.build@default:default,javax.servlet.jsp@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.rse.efs.ui@default:default,org.hamcrest.core@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.lucene@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.runtime@default:true,org.eclipse.wst.server.ui@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.jface@default:default,org.eclipse.debug.!
core@default:default,javax.xml@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.jdt.ui@default:default,org.apache.commons.el@default:default,org.mortbay.jetty.server@default:default,org.eclipse.cdt.core@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.core.databinding@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.osgi.util@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.osgi@-1:true,org.eclipse.ui.ide@default:default,org.eclipse.help.base@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.rse.connectorservice.telnet@default:default,org.eclipse.core.net@default:default,org.apache.xerces@default:default,org.eclipse.rse.dstore.security@defaul!
t:default,org.eclipse.jem.beaninfo.vm@default:default,org.ecli!
pse.ui.b
rowser@default:default,org.eclipse.jem.beaninfo@default:default,org.eclipse.jdt@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.ui@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.rse.subsystems.files.local@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.apache.lucene.analysis@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jdt.launching@default:default,o!
rg.eclipse.osgi.services@default:default,org.eclipse.dstore.extra@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.ecf@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.rse.core@default:default,org.eclipse.text@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.net@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.emf.codegen@default:default,org.junit4@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.httpclient*3.1.0.v201005080502@defaul!
t:default,org.eclipse.rse.subsystems.files.ssh@default:default!
,org.ecl
ipse.ltk.core.refactoring@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.sdk@default:default,org.apache.xml.resolver@default:default,org.eclipse.emf.edit@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.wst.xml.core@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jst.j2ee.ejb@default:default,org.apache.jasper@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.emf.edit.ui@default:default,org.sat4j.pb@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.cdt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.wst.sse.core@default:de!
fault,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.ui.console@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.jst.jee@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.rse.services.telnet@default:default,org.eclipse.rse.subsystems.shells.telnet@default:default,org.eclipse.rse.subsystems.processes.shell.linux@default:default,org.mortbay.jetty.util@default:default,org.eclipse.team.ui@default:default,org.eclipse.rse.shells.ui@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.tm.terminal.telnet@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.jsch.core@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.equinox.security.ui@default:de!
fault,org.eclipse.wst.html.core@default:default,org.eclipse.rs!
e.connec
torservice.dstore@default:default,org.eclipse.rse.efs@default:default,org.eclipse.update.core@default:default,org.eclipse.rse.services.dstore@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.rse.subsystems.files.ftp@default:default,org.eclipse.core.resources@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.wst.html.ui@default:default,org.eclipse.rse.subsystems.processes.local@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.views@default:default,org.eclipse.rse.useractions@default:default,org.apache.commons.net@default:default,javax.servlet@default:default,com.jcraft.jsch@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.rse.importexport@default:default,org.eclipse.wst.web@default:default,org.eclipse.c!
ore.net.linux.x86_64@default:false,org.eclipse.wst.internet.monitor.core@default:default"/>
+<stringAttribute key="selected_workspace_plugins"
value="org.eclipse.jsch.core@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.as.wtp.core@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.eclipse.ui.net@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.tools.common@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.eclipse.rse.services.ssh@default:default,org.jboss.tools.deltacloud.ui@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.jsch.ui@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.ec!
lipse.rse.subsystems.files.ssh@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="templateConfig"
value="${target_home}/configuration/config.ini"/>
<booleanAttribute key="tracing" value="false"/>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2010-12-27
19:51:30 UTC (rev 27753)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/META-INF/MANIFEST.MF 2010-12-27
19:53:54 UTC (rev 27754)
@@ -20,7 +20,8 @@
org.eclipse.core.databinding.beans;bundle-version="[1.2.100,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",
org.eclipse.equinox.security;bundle-version="[1.0.100,2.0.0)",
- org.eclipse.equinox.security.ui;bundle-version="1.0.200"
+ org.eclipse.equinox.security.ui;bundle-version="1.0.200",
+ org.eclipse.jsch.core;bundle-version="1.1.200"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.deltacloud.ui,
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2010-12-27
19:51:30 UTC (rev 27753)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -52,7 +52,7 @@
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.views.CVMessages;
-import org.jboss.tools.internal.deltacloud.ui.preferences.TextPreferenceValue;
+import org.jboss.tools.internal.deltacloud.ui.preferences.StringPreferenceValue;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
/**
@@ -77,7 +77,7 @@
private Label currentCloudSelectorLabel;
private TableViewer viewer;
private DeltaCloud currentCloud;
- private TextPreferenceValue lastSelectedCloudPref;
+ private StringPreferenceValue lastSelectedCloudPref;
private Composite container;
private ModifyListener currentCloudModifyListener = new ModifyListener() {
@@ -144,7 +144,7 @@
};
public AbstractCloudElementTableView() {
- lastSelectedCloudPref = new TextPreferenceValue(getSelectedCloudPrefsKey(),
Activator.getDefault());
+ lastSelectedCloudPref = new StringPreferenceValue(getSelectedCloudPrefsKey(),
Activator.PLUGIN_ID);
}
private boolean isNewCloud(DeltaCloud cloud) {
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/AbstractPreferenceValue.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/AbstractPreferenceValue.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/AbstractPreferenceValue.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * 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.preferences;
+
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
+
+/**
+ * @author Andre Dietisheim
+ */
+public abstract class AbstractPreferenceValue<TYPE> {
+
+ private String pluginId;
+ private String prefsKey;
+
+ public AbstractPreferenceValue(String prefsKey, String pluginId) {
+ this.pluginId = pluginId;
+ this.prefsKey = prefsKey;
+ }
+
+ public abstract TYPE get();
+
+ protected String doGet() {
+ return doGet(null);
+ }
+
+ public abstract TYPE get(TYPE currentValue);
+
+ protected String doGet(String currentValue) {
+ if( currentValue == null || currentValue.equals("")) {
+ // pre-set with previously used
+ Preferences prefs = getPreferences(this.pluginId);
+ return prefs.get(prefsKey, "");
+ } else {
+ return currentValue;
+ }
+ }
+
+ public void remove() {
+ String prefsValue = doGet();
+ if (prefsValue == null
+ || prefsValue == null) {
+ return;
+ }
+ store(null);
+ }
+
+ public abstract void store(TYPE value);
+
+ protected void doStore(String value) {
+ Preferences prefs = getPreferences(this.pluginId);
+ String prefsValue = prefs.get(prefsKey, "");
+ if (prefsValue == null
+ || prefsValue.equals("")
+ || !prefsValue.equals(value)) {
+ prefs.put(prefsKey, value);
+ try {
+ prefs.flush();
+ } catch (BackingStoreException bse) {
+ // intentionally ignore, non-critical
+ }
+ }
+ }
+
+ protected Preferences getPreferences(String pluginId) {
+ return new InstanceScope().getNode(pluginId);
+ }
+}
Property changes on:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/AbstractPreferenceValue.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * 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.preferences;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class StringEntriesPreferenceValue extends AbstractPreferenceValue<String[]>
{
+
+ private String delimiter;
+
+ public StringEntriesPreferenceValue(String delimiter, String prefsKey, String pluginId)
{
+ super(prefsKey, pluginId);
+ this.delimiter = delimiter;
+ }
+
+ public String[] get() {
+ return get(null);
+ }
+
+ public String[] get(String[] currentValues) {
+
+ String string = doGet(null);
+ String[] prefValues = string.split(delimiter);
+ return overrideValues(currentValues, prefValues);
+ }
+
+ private String[] overrideValues(String[] newValues, String[] prefValues) {
+ if (prefValues == null) {
+ return newValues;
+ }
+
+ for (int i = 0; i < prefValues.length; i++) {
+ if (newValues == null
+ || newValues.length < i) {
+ break;
+ }
+ prefValues[i] = newValues[i];
+ }
+ return prefValues;
+ }
+
+ public void add(String value) {
+ StringBuilder builder = new StringBuilder(doGet());
+ if (builder.length() > 0) {
+ builder.append(delimiter);
+ }
+ builder.append(value);
+ doStore(builder.toString());
+ }
+
+ /**
+ * Removes the given values from the strings stored in the preferences and
+ * stores the preferences.
+ *
+ * @param values
+ * the values
+ */
+ public void remove(String... valuesToRemove) {
+ String[] currentValues = get();
+ if (valuesToRemove != null) {
+ for (int i = 0; i < currentValues.length; i++) {
+ for (String valueToRemove : valuesToRemove) {
+ if (valueToRemove.equals(currentValues[i])) {
+ currentValues[i] = null;
+ }
+ }
+ }
+ }
+ store(currentValues);
+ }
+
+ /**
+ * Overrides the current values in the preferences with the values in the
+ * given array (value in the preferences at index x is overridden with the
+ * value in the given array at index x) and stores the preferences.
+ */
+ public void store(String[] newValues) {
+ String[] currentValues = get();
+ overrideValues(newValues, currentValues);
+ doStore(concatenate(currentValues));
+ }
+
+ protected String concatenate(String[] values) {
+ StringBuilder builder = new StringBuilder();
+ for (int i = 0; i < values.length; i++) {
+ if (values[i] != null) {
+ if (builder.length() > 0) {
+ builder.append(delimiter);
+ }
+ builder.append(values[i]);
+ }
+ }
+ return builder.toString();
+ }
+}
Property changes on:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringPreferenceValue.java
(from rev 27744,
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java)
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringPreferenceValue.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringPreferenceValue.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * 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.preferences;
+
+
+/**
+ * @author Andre Dietisheim
+ */
+public class StringPreferenceValue extends AbstractPreferenceValue<String> {
+
+ public StringPreferenceValue(String prefsKey, String pluginId) {
+ super(prefsKey, pluginId);
+ }
+
+ public String get() {
+ return get(null);
+ }
+
+ public String get(String currentValue) {
+ return doGet(currentValue);
+ }
+
+ public void store(String value) {
+ doStore(value);
+ }
+}
Property changes on:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringPreferenceValue.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java 2010-12-27
19:51:30 UTC (rev 27753)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -1,62 +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.preferences;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * @author Andre Dietisheim
- */
-public class TextPreferenceValue {
-
- private Plugin plugin;
- private String prefsKey;
-
- public TextPreferenceValue(String prefsKey, Plugin plugin) {
- this.plugin = plugin;
- this.prefsKey = prefsKey;
- }
-
- public String get() {
- return get(null);
- }
-
- public String get(String currentValue) {
- if( currentValue == null || currentValue.equals("")) {
- // pre-set with previously used
- Preferences prefs = getPreferences();
- return prefs.get(prefsKey, "");
- } else {
- return currentValue;
- }
- }
-
- public void store(String value) {
- Preferences prefs = getPreferences();
- String prefsValue = prefs.get(prefsKey, "");
- if (prefsValue == null || prefsValue.equals("") || !prefsValue.equals(value))
{
- prefs.put(prefsKey, value);
- try {
- prefs.flush();
- } catch (BackingStoreException bse) {
- // intentionally ignore, non-critical
- }
- }
-
- }
-
- protected Preferences getPreferences() {
- return new InstanceScope().getNode(plugin.getBundle().getSymbolicName());
- }
-}
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-12-27
19:51:30 UTC (rev 27753)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -65,7 +65,7 @@
import
org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.MandatoryStringValidator;
import org.jboss.tools.internal.deltacloud.ui.common.swt.JFaceUtils;
import org.jboss.tools.internal.deltacloud.ui.preferences.IPreferenceKeys;
-import org.jboss.tools.internal.deltacloud.ui.preferences.TextPreferenceValue;
+import org.jboss.tools.internal.deltacloud.ui.preferences.StringPreferenceValue;
/**
* @author Jeff Jonhston
@@ -329,7 +329,7 @@
.setAfterGetValidator(new
MandatoryStringValidator(WizardMessages.getString(MUST_ENTER_A_URL))),
null);
- String url = new TextPreferenceValue(IPreferenceKeys.LAST_URL, Activator.getDefault())
+ String url = new StringPreferenceValue(IPreferenceKeys.LAST_URL, Activator.PLUGIN_ID)
.get(urlText.getText());
urlText.setText(url);
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-12-27
19:51:30 UTC (rev 27753)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -269,9 +269,7 @@
private void createKey(final String keyId) {
try {
- DeltaCloudKey key = model.createKey(keyId);
-// I guess that the launch job stores the key in the appropriate place already
- PemFileFactory.create(key);
+ model.createKey(keyId);
} catch (Exception e) {
// TODO: internationalize strings
ErrorUtils.handleError(
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java 2010-12-27
19:51:30 UTC (rev 27753)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -40,7 +40,7 @@
private List<DeltaCloudKey> keys = new ArrayList<DeltaCloudKey>();
private DeltaCloud cloud;
private DeltaCloudKey selectedKey;
-
+
public ManageKeysPageModel(DeltaCloud cloud) {
this.cloud = cloud;
asyncGetKeys(cloud);
@@ -58,16 +58,17 @@
int index = keys.indexOf(selectedKey);
keys.remove(selectedKey);
fireIndexedPropertyChange(PROP_KEYS, index, selectedKey, null);
+ PemFileManager.delete(selectedKey);
setSelectedKey(index - 1);
}
- public DeltaCloudKey createKey(String keyId) throws DeltaCloudException {
+ public void createKey(String keyId) throws DeltaCloudException {
DeltaCloudKey key = cloud.createKey(keyId);
keys.add(key);
int index = keys.indexOf(key);
fireIndexedPropertyChange(PROP_KEYS, index, null, key);
setSelectedKey(key);
- return key;
+ PemFileManager.create(key);
}
public DeltaCloudKey getSelectedKey() {
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-27
19:51:30 UTC (rev 27753)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -23,7 +23,7 @@
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.internal.deltacloud.ui.preferences.IPreferenceKeys;
-import org.jboss.tools.internal.deltacloud.ui.preferences.TextPreferenceValue;
+import org.jboss.tools.internal.deltacloud.ui.preferences.StringPreferenceValue;
/**
* @author Jeff Johnston
@@ -106,7 +106,7 @@
String name = mainPage.getModel().getName();
String url = mainPage.getModel().getUrl();
- new TextPreferenceValue(IPreferenceKeys.LAST_URL, Activator.getDefault())
+ new StringPreferenceValue(IPreferenceKeys.LAST_URL, Activator.PLUGIN_ID)
.store(url);
String username = mainPage.getModel().getUsername();
Deleted:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.java 2010-12-27
19:51:30 UTC (rev 27753)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -1,78 +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.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.Path;
-import org.jboss.tools.deltacloud.core.DeltaCloudException;
-import org.jboss.tools.deltacloud.core.DeltaCloudKey;
-
-/**
- * @author André Dietisheim
- */
-public class PemFileFactory {
-
- private static final String PEM_FILE_SUFFIX = "pem";
-
- public static File create(DeltaCloudKey key) throws DeltaCloudException {
- return create(key, getKeyStorePath());
- }
-
- private static String getKeyStorePath() throws DeltaCloudException {
- // TODO: replace by code that queries the RSE preferences for its key
- // location setting
- String userHomePath = System.getProperty("user.home");
- if (userHomePath == null) {
- throw new DeltaCloudException("Could not determine path to save pem file
to");
- }
- return new StringBuilder(userHomePath)
- .append(File.separatorChar).append(".ssh").append(File.separatorChar)
- .toString();
- }
-
- private static File create(DeltaCloudKey key, String keyStorePath) throws
DeltaCloudException {
- try {
- File keyFile = createFile(key.getId(), keyStorePath);
- save(key.getPem(), keyFile);
- return keyFile;
- } catch (Exception e) {
- throw new DeltaCloudException(e);
- }
- }
-
- private static void save(String key, File keyFile) throws IOException {
- if (key != null) {
- FileWriter w = new FileWriter(keyFile);
- w.write(key);
- w.close();
- }
- }
-
- private static File createFile(String keyname, String keyStoreLocation)
- throws IOException {
- File keyFile =
- Path.fromOSString(keyStoreLocation)
- .append(keyname)
- .addFileExtension(PEM_FILE_SUFFIX) //$NON-NLS-1$
- .toFile();
- if (!keyFile.exists()) {
- keyFile.createNewFile();
- }
- keyFile.setReadable(false, false);
- keyFile.setWritable(true, true);
- keyFile.setReadable(true, true);
- return keyFile;
- }
-
-}
Copied:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java
(from rev 27739,
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileFactory.java)
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java
(rev 0)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java 2010-12-27
19:53:54 UTC (rev 27754)
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * 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.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.deltacloud.core.DeltaCloudException;
+import org.jboss.tools.deltacloud.core.DeltaCloudKey;
+import org.jboss.tools.internal.deltacloud.ui.preferences.StringEntriesPreferenceValue;
+
+/**
+ * @author André Dietisheim
+ */
+public class PemFileManager {
+
+ private static final String PEM_FILE_SUFFIX = "pem";
+ private static final String PLUGIN_ID = "org.eclipse.jsch.core";
+ private static final String KEY_PRIVATEKEY = "PRIVATEKEY";
+
+ private static StringEntriesPreferenceValue sshPrivateKeyPreference =
+ new StringEntriesPreferenceValue(",", KEY_PRIVATEKEY, PLUGIN_ID);
+
+ public static File create(DeltaCloudKey key) throws DeltaCloudException {
+ File file = create(key, getKeyStorePath());
+ sshPrivateKeyPreference.add(file.getName());
+ return file;
+ }
+
+ public static void delete(DeltaCloudKey key) throws DeltaCloudException {
+ File file = getFile(key.getId(), getKeyStorePath());
+ delete(file);
+ sshPrivateKeyPreference.remove(file.getName());
+ }
+
+ private static String getKeyStorePath() throws DeltaCloudException {
+ // TODO: replace by code that queries the RSE preferences for its key
+ // location setting
+ String userHomePath = System.getProperty("user.home");
+ if (userHomePath == null) {
+ throw new DeltaCloudException("Could not determine path to save pem file
to");
+ }
+ return new StringBuilder(userHomePath)
+ .append(File.separatorChar).append(".ssh").append(File.separatorChar)
+ .toString();
+ }
+
+ private static File create(DeltaCloudKey key, String keyStorePath) throws
DeltaCloudException {
+ try {
+ File keyFile = create(getFile(key.getId(), keyStorePath), keyStorePath);
+ save(key.getPem(), keyFile);
+ keyFile.setWritable(false, false);
+ return keyFile;
+ } catch (Exception e) {
+ throw new DeltaCloudException(e);
+ }
+ }
+
+ private static void save(String key, File keyFile) throws IOException {
+ if (key != null) {
+ FileWriter w = new FileWriter(keyFile);
+ w.write(key);
+ w.close();
+ }
+ }
+
+ private static File create(File file, String keyStoreLocation)
+ throws IOException {
+ if (!file.exists()) {
+ file.createNewFile();
+ }
+ file.setReadable(false, false);
+ file.setWritable(true, true);
+ file.setReadable(true, true);
+ return file;
+ }
+
+ private static File getFile(String keyId, String keyStoreLocation) {
+ File keyFile =
+ Path.fromOSString(keyStoreLocation)
+ .append(keyId)
+ .addFileExtension(PEM_FILE_SUFFIX) //$NON-NLS-1$
+ .toFile();
+ return keyFile;
+ }
+
+ private static void delete(File file) throws DeltaCloudException {
+ try {
+ if (file == null
+ || !file.exists()) {
+ return;
+ }
+ file.delete();
+ } catch (Exception e) {
+ throw new DeltaCloudException(e);
+ }
+ }
+
+}
Property changes on:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain