JBoss Tools SVN: r28133 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 11:07:48 -0500 (Wed, 12 Jan 2011)
New Revision: 28133
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java
Log:
[JBIDE-8096] adding the key that was selected to launch the instance to the ssh-prefs
Modified: 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 2011-01-12 16:05:20 UTC (rev 28132)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java 2011-01-12 16:07:48 UTC (rev 28133)
@@ -74,7 +74,7 @@
}
private boolean hasValues(String currentValues) {
- return currentValues != null && currentValues.length() >= 0;
+ return currentValues != null && currentValues.length() > 0;
}
/**
13 years, 8 months
JBoss Tools SVN: r28132 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/preferences and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 11:05:20 -0500 (Wed, 12 Jan 2011)
New Revision: 28132
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.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/preferences/StringEntriesPreferenceValue.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/NewInstanceWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java
Log:
[JBIDE-8096] adding the key that was selected to launch the instance to the ssh-prefs
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-12 13:56:52 UTC (rev 28131)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-12 16:05:20 UTC (rev 28132)
@@ -1,5 +1,10 @@
2011-01-12 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
+ (performFinish):
+ (addToSshPrefs):
+ [JBIDE-8096] adding the key that was selected to launch the instance to the ssh-prefs
+ (was: key was added when creating it, now: adding it when it gets selected)
* src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java (asyncGetKeys):
* src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java (refreshKeys):
[JBIDE-8081] refreshing keys now uses the wizards progress monitor and disables the widgets while refreshing is running
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-12 13:56:52 UTC (rev 28131)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/Deltacloud Tools.launch 2011-01-12 16:05:20 UTC (rev 28132)
@@ -23,8 +23,8 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -XX:MaxPermSize=256m -Xms40m -Xmx1024m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.core.databinding.property@default:default,org.eclipse.compare@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.wst.web@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.wst.sse.core@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.apache.lucene@default:default,org.eclipse.ui.editors@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.wst.web.ui@default:default,org.eclipse.jdt.junit.core@default!
:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.ui.views@default:default,org.eclipse.jst.jee.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.compare.core@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.sat4j.core@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.jst.common.project.facet.ui@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.jsch.core@default:default,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.w!
st.common.core@default:default,org.apache.commons.logging*1.0.!
4.v20100
5080501@default:default,org.eclipse.pde.build@default:default,org.eclipse.emf.edit@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.core.resources@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.osgi@-1:true,org.eclipse.emf.common@default:default,org.apache.xml.resolver@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.sdk@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.equino!
x.p2.core@default:default,org.apache.ant@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.rse.services.ssh@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.jem.util@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.ui.intro@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.wst.common.frameworks@default:default,com.ibm.icu@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.equinox.p2.jarprocessor@default:def!
ault,org.eclipse.wst.server.ui@default:default,org.eclipse.jst!
.server.
ui@default:default,org.junit4@default:default,org.eclipse.core.runtime@default:true,javax.xml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.rse.core@default:default,org.eclipse.tm.terminal.ssh@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.jem@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.jface@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.help.base@default:default,org.eclipse.equinox.p2.publisher@default:default,org.apache.lucene.analysis@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.services@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.text@default:default,javax.servlet@default:default,org.eclip!
se.ui.views.properties.tabbed@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.tm.terminal.telnet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.expressions@default:default,org.eclipse.help@default:default,org.eclipse.jface.text@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.ui.navigator@default:default,org.apache.jasper@default:default,org.eclipse.core.variables@default:default,org.eclipse.help.ui@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.jst.j2ee.web@defa!
ult:default,org.eclipse.search@default:default,org.eclipse.ui@!
default:
default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.eclipse.ui.console@default:default,org.apache.commons.net@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.wst.common.modulecore@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.jst.j2ee.navigator.ui@default:default,org.sat4j.pb@default:default,org.eclipse.ecf.identity@default:default,org.apache.commons.el@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.swt@default:default,org.eclipse.jst.jee@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.equinox.p2.garbagecollector!
@default:default,org.eclipse.jem.workbench@default:default,org.eclipse.jdt@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.core.databinding@default:default,org.eclipse.jst.common.ui@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.validation@default:default,org.eclipse.team.core@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.apache.xerces@default:default,org.hamcrest.core@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.equinox.p2.operations@default:def!
ault,org.eclipse.pde.core@default:default,org.eclipse.jst.comm!
on.frame
works@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.osgi.services@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.debug.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.jst.server.core@default:default,javax.servlet.jsp@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.ui.browser@default:default,org.eclipse.core.contenttype@default:default,org.apache.xml.serializer@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.update.core@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.ant.core@default:default,org.eclipse.swt.!
gtk.linux.x86_64@default:false,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.core.commands@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.app@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.rse.ui@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,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.ide.eclipse.as.ui@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.ide.eclipse.as.rse.core@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.tools.deltacloud.core@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.http.jetty@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.equinox.p2.metadata@default:default,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.eclipse.jst.j2ee.web@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,javax.servlet@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.jst.j2ee.core@default:default,org.eclipse.text@default:default,org.eclipse.tm.terminal@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.jst.common.annotations.core@default:default,org.eclipse.wst.validation@default:default,org.eclipse.tm.terminal.telnet@default:default,org.apache.ant@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.sdk@default:de!
fault,org.eclipse.rse.services@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.jst.server.ui@default:default,org.eclipse.wst.common.modulecore.ui@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.resources@default:default,org.eclipse.rse.services.files.ftp@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.jface.text@default:default,org.eclipse.jem.util@default:default,org.apache.lucene@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.rse.subsystems.files.core@default:default,org.eclipse.tm.terminal.ssh@default:default,org.eclipse.jst.j2ee.ejb@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.jst.j2ee.jca@default:default,org.eclipse.equinox.registry@default:default!
,org.eclipse.equinox.p2.garbagecollector@default:default,org.a!
pache.ja
sper@default:default,org.eclipse.wst.common.modulecore@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.wst.jsdt.ui@default:default,org.eclipse.rse.services.local@default:default,org.eclipse.jst.common.frameworks@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.rse.ui@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.ecf@default:default,org.eclipse.rse.files.ui@default:default,org.eclipse.rse.subsystems.files.ssh@default:default,org.sat4j.core@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.emf.codegen@default:default,org.apache.xerces@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.osgi.services@default:default,org.eclipse.jst.server.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.p2.ui@default:default,org.!
eclipse.ui@default:default,org.mortbay.jetty.util@default:default,org.eclipse.debug.core@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.update.configurator@3:true,org.eclipse.ui.forms@default:default,org.eclipse.wst.server.ui@default:default,org.hamcrest.core@default:default,org.eclipse.rse.subsystems.shells.ssh@default:default,org.eclipse.jsch.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.xml.resolver@default:default,org.eclipse.jst.jee.ui@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.sat4j.pb@default:default,org.eclipse.osgi@-1:true,org.eclipse.jdt@default:default,org.eclipse.wst.html.ui@default:default,org.eclipse.compare@default:default,org.eclipse.help.base@default:!
default,org.eclipse.ui.workbench@default:default,org.eclipse.e!
quinox.h
ttp.servlet@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.wst.common.project.facet.ui@default:default,org.eclipse.help@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.jst.jee@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.common@2:true,org.eclipse.jdt.ui@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.debug@default:default,org.eclipse.jst.common.project.facet.ui@default:default,com.jcraft.jsch@default:default,org.eclipse.tm.terminal.view@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jst.servlet.ui@default:default,org.eclipse.jst.j2ee.navigator.ui@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.pde.build@default:default,org.eclipse.jst.common.annotations.controller@default:default,org.eclipse!
.update.core@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.wst.html.core@default:default,org.eclipse.wst.xml.core@default:default,org.mortbay.jetty.server@default:default,org.eclipse.jface@default:default,org.eclipse.wst.internet.monitor.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.core.contenttype@default:default,javax.xml@default:default,com.ibm.icu@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.search@default:default,org.junit4@default:default,org.eclipse.ui.browser@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.jst.common.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.core.expressions@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.databinding.beans@default:default,org.apache.commons.net@default:default,org.eclipse.!
jem@default:default,org.eclipse.ui.views.properties.tabbed@def!
ault:def
ault,org.eclipse.core.databinding.observable@default:default,org.eclipse.rse.services.ssh@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.jst.j2ee.jca.ui@default:default,org.eclipse.core.commands@default:default,org.eclipse.swt@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.jst.common.project.facet.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.intro@default:default,javax.servlet.jsp@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.rse.subsystems.terminals.ssh@default:default,org.eclipse.team.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jem.workbench@default:defa!
ult,org.eclipse.wst.jsdt.manipulation@default:default,org.eclipse.jst.j2ee@default:default,org.eclipse.wst.web@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.jobs@default:default,org.apache.xml.serializer@default:default,org.eclipse.jem.proxy@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.rse.core@default:default,org.eclipse.rse.connectorservice.ssh@default:default,org.eclipse.wst.css.ui@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.variables@default:default,org.eclipse.swtbot.ant.optional.junit4@default:false,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.team.core@default:default,org.eclipse.jst.j2ee.ejb.annotation.model@default:default,org.eclipse.wst.jsdt.core@default:default,org.eclipse.wst.co!
mmon.emfworkbench.integration@default:default,org.apache.commo!
ns.httpc
lient*3.1.0.v201005080502@default:default,org.eclipse.wst.server.core@default:default,org.eclipse.ui.ide@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.jst.j2ee.ui@default:default,org.eclipse.wst.server.ui.doc.user@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.swtbot.ant.optional.junit3@default:false,org.apache.lucene.analysis@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.core.net@default:default,org.eclipse.help.ui@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.wst.css.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.rse.subsystems.shells.core@default:default,org.eclipse.pde.core@default:default,org.eclipse.ui.views.log@default:d!
efault,org.eclipse.wst.common.core@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.commons.el@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.wst.server.discovery@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.wst.web.ui@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.ide.eclipse.as.wtp.core@default:default,org.jboss.tools.usage@default:default,org.jboss.tools.common@default:default,org.jboss.tools.deltacloud.integration@default:default,org.jboss.ide.eclipse.as.rse.ui@default:default,org.jboss.ide.eclipse.archives.ui@default:default,org.jboss.tools.deltacloud.core@default:default,org.jboss.ide.eclipse.as.wtp.ui@default:default,org.jboss.tools.deltacloud.ui@default:default,org.jboss.ide.eclipse.as.core@default:default,org.jboss.ide.eclipse.archives.webtools@default:default,org.jboss.tools.jmx.ui@default:default,org.jboss.tools.jmx.core@default:default,org.jboss.ide.eclipse.as.ui@default:default,org.jboss.ide.eclipse.archives.core@default:default,org.jboss.ide.eclipse.as.rse.core@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/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 2011-01-12 13:56:52 UTC (rev 28131)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/StringEntriesPreferenceValue.java 2011-01-12 16:05:20 UTC (rev 28132)
@@ -48,15 +48,35 @@
return prefValues;
}
+ /**
+ * Adds the given string value to this preference value(s). Duplicate values
+ * are not added
+ *
+ * @param value
+ * the value to add
+ */
public void add(String value) {
- StringBuilder builder = new StringBuilder(doGet());
- if (builder.length() > 0) {
- builder.append(delimiter);
+ String currentValues = doGet();
+ StringBuilder builder = new StringBuilder(currentValues);
+ if (!contains(value, currentValues)) {
+ if (hasValues(currentValues)) {
+ builder.append(delimiter);
+ }
+ builder.append(value);
+ doStore(builder.toString());
}
- builder.append(value);
- doStore(builder.toString());
}
+ private boolean contains(String value, String currentValues) {
+ return currentValues != null
+ && currentValues.length() > 0
+ && currentValues.indexOf(value) >= 0;
+ }
+
+ private boolean hasValues(String currentValues) {
+ return currentValues != null && currentValues.length() >= 0;
+ }
+
/**
* Removes the given values from the strings stored in the preferences and
* stores the preferences.
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 2011-01-12 13:56:52 UTC (rev 28131)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPageModel.java 2011-01-12 16:05:20 UTC (rev 28132)
@@ -55,7 +55,7 @@
int index = keys.indexOf(selectedKey);
keys.remove(selectedKey);
fireIndexedPropertyChange(PROP_KEYS, index, selectedKey, null);
- PemFileManager.delete(selectedKey);
+ PemFileManager.delete(selectedKey, SshPrivateKeysPreferences.getKeyStorePath());
setSelectedKey(index - 1);
}
@@ -65,7 +65,7 @@
int index = keys.indexOf(key);
fireIndexedPropertyChange(PROP_KEYS, index, null, key);
setSelectedKey(key);
- PemFileManager.create(key);
+ PemFileManager.create(key, SshPrivateKeysPreferences.getKeyStorePath());
}
public Job refreshKeys() {
@@ -107,10 +107,10 @@
public void setSelectedKey() {
DeltaCloudKey key = getSelectedKey();
if (key == null) {
-System.err.println("selected key = 0");
+ System.err.println("selected key = 0");
setSelectedKey(0);
} else {
-System.err.println("selected key = " + key);
+ System.err.println("selected key = " + key);
setSelectedKey(key);
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-12 13:56:52 UTC (rev 28131)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-12 16:05:20 UTC (rev 28132)
@@ -10,8 +10,10 @@
*******************************************************************************/
package org.jboss.tools.internal.deltacloud.ui.wizards;
+import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.text.MessageFormat;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -77,11 +79,11 @@
}
}
- @Override
- public boolean canFinish() {
- //return mainPage.isPageComplete();
- return super.canFinish();
- }
+ // @Override
+ // public boolean canFinish() {
+ // //return mainPage.isPageComplete();
+ // return super.canFinish();
+ // }
@Override
public boolean performFinish() {
@@ -160,10 +162,25 @@
WizardMessages.getFormattedString(CREATE_INSTANCE_FAILURE_MSG,
new String[] { name, imageId, realmId, profileId }),
e, getShell());
+ } else {
+ addToSshPrefs(keyId);
}
+
return result;
}
+ private void addToSshPrefs(String keyId) {
+ try {
+ File pemFile = PemFileManager.getFile(keyId, SshPrivateKeysPreferences.getKeyStorePath());
+ if (pemFile != null) {
+ SshPrivateKeysPreferences.add(pemFile.getName());
+ }
+ } catch (DeltaCloudException e) {
+ ErrorUtils.handleError("Error",
+ MessageFormat.format("Could not add key \"{0}\" to ssh preferences", keyId), e, getShell());
+ }
+ }
+
private String utf8Encode(String string) {
try {
return URLEncoder.encode(string, "UTF-8");
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java 2011-01-12 13:56:52 UTC (rev 28131)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/PemFileManager.java 2011-01-12 16:05:20 UTC (rev 28132)
@@ -13,11 +13,12 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.text.MessageFormat;
+import org.eclipse.core.runtime.Assert;
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
@@ -25,38 +26,25 @@
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, String keyStorePath) throws DeltaCloudException {
+ try {
+ Assert.isLegal(key != null);
+ Assert.isLegal(keyStorePath != null && keyStorePath.length() > 0);
- 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");
+ File file = getFile(key.getId(), keyStorePath);
+ delete(file);
+ } catch (DeltaCloudException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new DeltaCloudException(MessageFormat.format("Coud not delete key \"{0}\"", key.getName()), e);
}
- return new StringBuilder(userHomePath)
- .append(File.separatorChar).append(".ssh").append(File.separatorChar)
- .toString();
}
- private static File create(DeltaCloudKey key, String keyStorePath) throws DeltaCloudException {
+ public static File create(DeltaCloudKey key, String keyStorePath) throws DeltaCloudException {
try {
+ Assert.isLegal(key != null);
+ Assert.isLegal(keyStorePath != null && keyStorePath.length() > 0);
File keyFile = create(getFile(key.getId(), keyStorePath), keyStorePath);
save(key.getPem(), keyFile);
keyFile.setWritable(false, false);
@@ -85,7 +73,7 @@
return file;
}
- private static File getFile(String keyId, String keyStoreLocation) {
+ public static File getFile(String keyId, String keyStoreLocation) {
File keyFile =
Path.fromOSString(keyStoreLocation)
.append(keyId)
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-12 16:05:20 UTC (rev 28132)
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * 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 org.jboss.tools.deltacloud.core.DeltaCloudException;
+import org.jboss.tools.internal.deltacloud.ui.preferences.StringEntriesPreferenceValue;
+import org.jboss.tools.internal.deltacloud.ui.preferences.StringPreferenceValue;
+
+/**
+ * @author André Dietisheim
+ */
+public class SshPrivateKeysPreferences {
+
+ private static final String PLUGIN_ID = "org.eclipse.jsch.core";
+ /**
+ * Preference keys defined by org.eclipse.jsch.
+ *
+ * these keys are replicates from org.eclipse.jsch.internal.core.IConstants
+ */
+ private static final String PRIVATEKEY = "PRIVATEKEY";
+ private static final String SSH2HOME = "SSH2HOME";
+
+ private static StringEntriesPreferenceValue sshPrivateKeyPreference =
+ new StringEntriesPreferenceValue(",", PRIVATEKEY, PLUGIN_ID);
+ private static StringPreferenceValue sshHome = new StringPreferenceValue(SSH2HOME, PLUGIN_ID);
+
+ /**
+ * Adds the given keyName to the ssh-preferences
+ *
+ * @param keyName
+ * the name of the key to add
+ */
+ public static void add(String keyName) {
+ sshPrivateKeyPreference.add(keyName);
+ }
+
+ /**
+ * Removes the given keyName from the ssh-preferences
+ *
+ * @param keyName
+ * the name of the key to remove
+ */
+ public static void remove(String keyName) {
+ sshPrivateKeyPreference.remove(keyName);
+ }
+
+ public 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();
+ return sshHome.get();
+ }
+
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 8 months
JBoss Tools SVN: r28131 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 08:56:52 -0500 (Wed, 12 Jan 2011)
New Revision: 28131
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
Log:
corrected NPE
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-01-12 13:32:13 UTC (rev 28130)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-01-12 13:56:52 UTC (rev 28131)
@@ -106,6 +106,9 @@
}
protected IRemoteFileSubSystem findRemoteFileSubSystem() {
+ if (host == null) {
+ return null;
+ }
ISubSystem[] systems = RSECorePlugin.getTheSystemRegistry().getSubSystems(host);
for( int i = 0; i < systems.length; i++ ) {
if(systems[i] instanceof IRemoteFileSubSystem ) {
13 years, 8 months
JBoss Tools SVN: r28130 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 08:32:13 -0500 (Wed, 12 Jan 2011)
New Revision: 28130
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-12 13:31:22 UTC (rev 28129)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-12 13:32:13 UTC (rev 28130)
@@ -44,6 +44,9 @@
* @author Rob Stryker
*/
public class RSEandASWizardPage extends WizardPage implements INewInstanceWizardPage {
+ private final static String CREATE_RSE_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_RSE_PREF_KEY";
+ private final static String CREATE_SERVER_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_SERVER_PREF_KEY";
+
private Button createRSE, createServer;
private Group serverDetailsGroup;
private Button autoScanCheck, hardCodeServerDetails, deployOnlyRadio,
@@ -51,24 +54,21 @@
private Text remoteDetailsLoc, serverHomeText, serverConfigText, deployFolderText;
private Label serverHome, serverConfig, localRuntimeLabel, autoLocalRuntimeLabel, deployFolder;
private Combo autoLocalRuntimeCombo,localRuntimeCombo;
-
- private final static String CREATE_RSE_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_RSE_PREF_KEY";
- private final static String CREATE_SERVER_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_SERVER_PREF_KEY";
+ private IHost initialHost;
+ private ArrayList<IRuntime> localRuntimes = new ArrayList<IRuntime>();
+
public RSEandASWizardPage() {
super("Create RSE Connection and Server");
setTitle("Create RSE Connection and Server");
setDescription("Here you can choose to create a matching RSE connection and a Server adapter");
}
- private IHost initialHost;
public RSEandASWizardPage(IHost host) {
this();
this.initialHost = host;
}
-
-
public void createControl(Composite parent) {
Composite c2 = new Composite(parent, SWT.NONE);
c2.setLayout(new FormLayout());
@@ -205,7 +205,6 @@
setControl(c2);
}
- private ArrayList<IRuntime> localRuntimes = new ArrayList<IRuntime>();
private void fillRuntimeTypeCombo() {
localRuntimes.clear();
IRuntime[] rts = ServerCore.getRuntimes();
13 years, 8 months
JBoss Tools SVN: r28129 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 08:31:22 -0500 (Wed, 12 Jan 2011)
New Revision: 28129
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/plugin.xml
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
Log:
[JBIDE-7761] cloud viewer now also has command "show in remote system explorer"
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/plugin.xml 2011-01-12 13:30:40 UTC (rev 28128)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/plugin.xml 2011-01-12 13:31:22 UTC (rev 28129)
@@ -40,7 +40,7 @@
<extension point="org.eclipse.ui.menus">
<menuContribution
allPopups="true"
- locationURI="popup:org.jboss.tools.deltacloud.ui.views.InstanceView?after=instances">
+ locationURI="popup:org.jboss.tools.deltacloud.ui.views.InstanceView?after=additions">
<command
commandId="org.jboss.tools.deltacloud.integration.rse.showremotesysexplorer"
disabledIcon="icons/system_viewd.gif"
@@ -51,6 +51,20 @@
</command>
</menuContribution>
</extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="true"
+ locationURI="popup:org.jboss.tools.deltacloud.ui.views.DeltaCloudView?after=additions">
+ <command
+ commandId="org.jboss.tools.deltacloud.integration.rse.showremotesysexplorer"
+ disabledIcon="icons/system_viewd.gif"
+ icon="icons/system_view.gif"
+ label="%command.showInRemoteSysExplorer"
+ style="push"
+ tooltip="%command.showInRemoteSysExplorer.tooltip">
+ </command>
+ </menuContribution>
+ </extension>
<extension
point="org.jboss.tools.deltacloud.ui.newInstanceWizardPage">
<page
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-01-12 13:30:40 UTC (rev 28128)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2011-01-12 13:31:22 UTC (rev 28129)
@@ -483,6 +483,9 @@
name="instances"
visible="true" />
<separator
+ name="additions"
+ visible="true" />
+ <separator
name="connections"
visible="true" />
<separator
13 years, 8 months
JBoss Tools SVN: r28128 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/icons.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 08:30:40 -0500 (Wed, 12 Jan 2011)
New Revision: 28128
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/icons/system_view.gif
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/icons/system_viewd.gif
Log:
added missing icons
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/icons/system_view.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/icons/system_view.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/icons/system_viewd.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/icons/system_viewd.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
13 years, 8 months
JBoss Tools SVN: r28126 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 08:29:29 -0500 (Wed, 12 Jan 2011)
New Revision: 28126
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java
Log:
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12 13:26:32 UTC (rev 28125)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12 13:29:29 UTC (rev 28126)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.utils;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -89,5 +91,11 @@
return stringValue;
}
-
+ public static String toString(InputStream inputStream) throws IOException {
+ StringBuilder builder = new StringBuilder();
+ for(int character = -1; (character = inputStream.read()) != -1; ) {
+ builder.append(character);
+ }
+ return builder.toString();
+ }
}
13 years, 8 months
JBoss Tools SVN: r28125 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 08:26:32 -0500 (Wed, 12 Jan 2011)
New Revision: 28125
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/AbstractCloudJob.java
Log:
[JBIDE-8083] corrected error text
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/AbstractCloudJob.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/AbstractCloudJob.java 2011-01-12 13:08:32 UTC (rev 28124)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/job/AbstractCloudJob.java 2011-01-12 13:26:32 UTC (rev 28125)
@@ -47,7 +47,7 @@
} catch (Exception e) {
// TODO: internationalize strings
return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID,
- MessageFormat.format("Could not {0}", getName()), e);
+ MessageFormat.format("Could not perform \"{0}\"", getName()), e);
} finally {
monitor.done();
Job.getJobManager().endRule(rule);
13 years, 8 months
JBoss Tools SVN: r28124 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-12 08:08:32 -0500 (Wed, 12 Jan 2011)
New Revision: 28124
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/plugin.xml
Log:
[JBIDE-8095] made command "show in remote system exploerer" to be available only if a single instance is selected
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/plugin.xml 2011-01-12 13:06:33 UTC (rev 28123)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/plugin.xml 2011-01-12 13:08:32 UTC (rev 28124)
@@ -40,7 +40,7 @@
<extension point="org.eclipse.ui.menus">
<menuContribution
allPopups="true"
- locationURI="popup:org.jboss.tools.deltacloud.ui.views.InstanceView?after=additions">
+ locationURI="popup:org.jboss.tools.deltacloud.ui.views.InstanceView?after=instances">
<command
commandId="org.jboss.tools.deltacloud.integration.rse.showremotesysexplorer"
disabledIcon="icons/system_viewd.gif"
@@ -51,20 +51,6 @@
</command>
</menuContribution>
</extension>
- <extension point="org.eclipse.ui.menus">
- <menuContribution
- allPopups="true"
- locationURI="popup:org.jboss.tools.deltacloud.ui.views.DeltaCloudView?after=additions">
- <command
- commandId="org.jboss.tools.deltacloud.integration.rse.showremotesysexplorer"
- disabledIcon="icons/system_viewd.gif"
- icon="icons/system_view.gif"
- label="%command.showInRemoteSysExplorer"
- style="push"
- tooltip="%command.showInRemoteSysExplorer.tooltip">
- </command>
- </menuContribution>
- </extension>
<extension
point="org.jboss.tools.deltacloud.ui.newInstanceWizardPage">
<page
13 years, 8 months