JBoss Tools SVN: r27749 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-12-27 08:41:52 -0500 (Mon, 27 Dec 2010)
New Revision: 27749
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
Log:
JBIDE-7946
https://issues.jboss.org/browse/JBIDE-7946
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2010-12-27 12:10:44 UTC (rev 27748)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2010-12-27 13:41:52 UTC (rev 27749)
@@ -145,14 +145,8 @@
if(ps == null || ps.isEmpty()) {
return getDefinitions().getAllAnnotations();
}
- List<AnnotationDefinition> ds = getDefinitions().getAllAnnotations();
List<AnnotationDefinition> result = new ArrayList<AnnotationDefinition>();
- result.addAll(ds);
Set<IType> types = new HashSet<IType>();
- for (AnnotationDefinition d: ds) {
- IType t = d.getType();
- if(t != null) types.add(t);
- }
for (CDICoreNature p: ps) {
List<AnnotationDefinition> ds2 = p.getDefinitions().getAllAnnotations();
for (AnnotationDefinition d: ds2) {
@@ -163,6 +157,16 @@
}
}
}
+
+ List<AnnotationDefinition> ds = getDefinitions().getAllAnnotations();
+ for (AnnotationDefinition d: ds) {
+ IType t = d.getType();
+ if(t != null && !types.contains(t)) {
+ types.add(t);
+ result.add(d);
+ }
+ }
+
return result;
}
14 years
JBoss Tools SVN: r27748 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-12-27 07:10:44 -0500 (Mon, 27 Dec 2010)
New Revision: 27748
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/Flasher.java
Log:
https://issues.jboss.org/browse/JBIDE-7957
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/Flasher.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/Flasher.java 2010-12-27 12:03:54 UTC (rev 27747)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/Flasher.java 2010-12-27 12:10:44 UTC (rev 27748)
@@ -17,7 +17,8 @@
public class Flasher {
private inIFlasher iFlasher;
private static final boolean IS_OPEN_JDK = (System.getProperty("java.runtime.name")!=null&&System.getProperty("java.runtime.name").contains("OpenJDK")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
+ //fix for JBIDE-7957
+ private static final boolean IS_LINUX_X86_64=Platform.OS_LINUX.equals(Platform.getOS())&&Platform.ARCH_X86_64.equals(Platform.getOSArch());
// added by Maksim Areshkau as element for which we
// have drowed border. When we draw new border,
// we should remove old one;
@@ -32,7 +33,8 @@
iFlasher.setThickness(2);
//fix for JBIDE-7295, added by Maksim Areshkau
if (Platform.OS_MACOSX.equals(Platform.getOS())
- ||IS_OPEN_JDK) {
+ ||IS_OPEN_JDK
+ ||IS_LINUX_X86_64) {
drawOutline = new DrawOutlineInterface() {
private nsIDOMElement lastBorderedElement = null;
public void drawElementOutline(nsIDOMElement domElement) {
14 years
JBoss Tools SVN: r27747 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-12-27 07:03:54 -0500 (Mon, 27 Dec 2010)
New Revision: 27747
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
Log:
JBIDE-7998
https://issues.jboss.org/browse/JBIDE-7998
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-12-27 11:40:18 UTC (rev 27746)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2010-12-27 12:03:54 UTC (rev 27747)
@@ -14,6 +14,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.jboss.tools.cdi.core.CDIConstants;
+import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IAnnotationDeclaration;
import org.jboss.tools.cdi.core.IBean;
@@ -22,6 +23,10 @@
import org.jboss.tools.cdi.core.IProducer;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IScope;
+import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.KbProjectFactory;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
+import org.jboss.tools.jst.web.kb.internal.KbProject;
import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
@@ -141,6 +146,21 @@
assertNotNull(q);
}
+ public void testProjectDependencyLoading() throws CoreException, IOException {
+ IKbProject kb2 = KbProjectFactory.getKbProject(project2, true);
+ ((KbProject)kb2).store();
+ CDICoreNature cdi2 = CDICorePlugin.getCDI(project2, true);
+ Set<CDICoreNature> dependsOn = cdi2.getCDIProjects();
+ Set<CDICoreNature> usedBy = cdi2.getDependentProjects();
+ assertEquals(1, dependsOn.size());
+ assertEquals(1, usedBy.size());
+ cdi2.reloadProjectDependencies();
+ dependsOn = cdi2.getCDIProjects();
+ usedBy = cdi2.getDependentProjects();
+ assertEquals(1, dependsOn.size());
+ assertEquals(1, usedBy.size());
+ }
+
public void tearDown() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
JobUtils.waitForIdle();
14 years
JBoss Tools SVN: r27746 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-12-27 06:40:18 -0500 (Mon, 27 Dec 2010)
New Revision: 27746
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
Log:
JBIDE-7998
https://issues.jboss.org/browse/JBIDE-7998
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2010-12-27 11:34:35 UTC (rev 27745)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2010-12-27 11:40:18 UTC (rev 27746)
@@ -481,7 +481,6 @@
if(project == null || !project.isAccessible()) continue;
CDICoreNature sp = CDICorePlugin.getCDI(project, false);
if(sp != null) {
- System.out.println("-2->Add " + getProject() + " to " + sp.getProject());
addDependentCDIProject(sp);
}
}
14 years
JBoss Tools SVN: r27745 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-12-27 06:34:35 -0500 (Mon, 27 Dec 2010)
New Revision: 27745
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
Log:
JBIDE-7998
https://issues.jboss.org/browse/JBIDE-7998
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2010-12-27 00:07:40 UTC (rev 27744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2010-12-27 11:34:35 UTC (rev 27745)
@@ -23,6 +23,7 @@
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IProjectNature;
import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -35,8 +36,11 @@
import org.jboss.tools.common.model.XJob;
import org.jboss.tools.common.model.XJob.XRunnable;
import org.jboss.tools.common.util.FileUtil;
+import org.jboss.tools.common.xml.XMLUtilities;
+import org.jboss.tools.jst.web.kb.WebKbPlugin;
import org.jboss.tools.jst.web.kb.internal.IKBBuilderRequiredNature;
import org.jboss.tools.jst.web.kb.internal.validation.ProjectValidationContext;
+import org.w3c.dom.Element;
public class CDICoreNature implements IProjectNature, IKBBuilderRequiredNature {
public static String NATURE_ID = "org.jboss.tools.cdi.core.cdinature";
@@ -168,7 +172,7 @@
public void addCDIProject(final CDICoreNature p) {
if(dependsOn.contains(p)) return;
- dependsOn.add(p);
+ addUsedCDIProject(p);
p.addDependentCDIProject(this);
//TODO
if(!p.isStorageResolved()) {
@@ -190,10 +194,18 @@
public void removeCDIProject(CDICoreNature p) {
if(!dependsOn.contains(p)) return;
p.usedBy.remove(this);
- dependsOn.remove(p);
+ synchronized (dependsOn) {
+ dependsOn.remove(p);
+ }
//TODO
}
+ void addUsedCDIProject(CDICoreNature p) {
+ synchronized (dependsOn) {
+ dependsOn.add(p);
+ }
+ }
+
public void addDependentCDIProject(CDICoreNature p) {
usedBy.add(p);
}
@@ -250,24 +262,26 @@
CDICorePlugin.getDefault().logError(e);
}
-// postponeFiring();
-//
-// try {
+ postponeFiring();
+
+ try {
// boolean b = getClassPath().update();
// if(b) {
// getClassPath().validateProjectDependencies();
// }
// File file = getStorageFile();
-//
-// //TODO
-//
+
+ //Use kb storage for dependent projects since cdi is not stored.
+ loadProjectDependenciesFromKBProject();
+ //TODO
+
// if(b) {
// getClassPath().process();
// }
-//
-// } finally {
-// fireChanges();
-// }
+
+ } finally {
+ fireChanges();
+ }
}
public void clean() {
@@ -413,4 +427,66 @@
public String getNatureDescription() {
return CDICoreMessages.CDI_NATURE_DESCRIPTION;
}
+
+ /**
+ * Test method.
+ */
+ public void reloadProjectDependencies() {
+ dependsOn.clear();
+ usedBy.clear();
+ loadProjectDependenciesFromKBProject();
+ }
+
+ private void loadProjectDependenciesFromKBProject() {
+ Element root = null;
+ File file = getKBStorageFile();
+ if(file != null && file.isFile()) {
+ root = XMLUtilities.getElement(file, null);
+ if(root != null) {
+ loadProjectDependencies(root);
+ }
+ }
+ }
+
+ private File getKBStorageFile() {
+ IPath path = WebKbPlugin.getDefault().getStateLocation();
+ File file = new File(path.toFile(), "projects/" + project.getName() + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$
+ return file;
+ }
+
+ private void loadProjectDependencies(Element root) {
+ Element dependsOnElement = XMLUtilities.getUniqueChild(root, "depends-on-projects"); //$NON-NLS-1$
+ if(dependsOnElement != null) {
+ Element[] paths = XMLUtilities.getChildren(dependsOnElement, "project"); //$NON-NLS-1$
+ for (int i = 0; i < paths.length; i++) {
+ String p = paths[i].getAttribute("name"); //$NON-NLS-1$
+ if(p == null || p.trim().length() == 0) continue;
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(p);
+ if(project == null || !project.isAccessible()) continue;
+ CDICoreNature sp = CDICorePlugin.getCDI(project, false);
+ if(sp != null) {
+ addUsedCDIProject(sp);
+ sp.addDependentCDIProject(this);
+ }
+ }
+ }
+
+ Element usedElement = XMLUtilities.getUniqueChild(root, "used-by-projects"); //$NON-NLS-1$
+ if(usedElement != null) {
+ Element[] paths = XMLUtilities.getChildren(usedElement, "project"); //$NON-NLS-1$
+ for (int i = 0; i < paths.length; i++) {
+ String p = paths[i].getAttribute("name"); //$NON-NLS-1$
+ if(p == null || p.trim().length() == 0) continue;
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(p);
+ if(project == null || !project.isAccessible()) continue;
+ CDICoreNature sp = CDICorePlugin.getCDI(project, false);
+ if(sp != null) {
+ System.out.println("-2->Add " + getProject() + " to " + sp.getProject());
+ addDependentCDIProject(sp);
+ }
+ }
+ }
+
+ }
+
}
\ No newline at end of file
14 years
JBoss Tools SVN: r27744 - 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: 2010-12-26 19:07:40 -0500 (Sun, 26 Dec 2010)
New Revision: 27744
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java
Log:
made preference provider overridable
Modified: 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-26 22:44:30 UTC (rev 27743)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/preferences/TextPreferenceValue.java 2010-12-27 00:07:40 UTC (rev 27744)
@@ -56,7 +56,7 @@
}
- private Preferences getPreferences() {
+ protected Preferences getPreferences() {
return new InstanceScope().getNode(plugin.getBundle().getSymbolicName());
}
}
14 years
JBoss Tools SVN: r27743 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-26 17:44:30 -0500 (Sun, 26 Dec 2010)
New Revision: 27743
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyUnmarshaller.java
Log:
[JBIDE-7763] I dont remove trailing \n any longer
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyUnmarshaller.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyUnmarshaller.java 2010-12-26 21:59:03 UTC (rev 27742)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/unmarshal/KeyUnmarshaller.java 2010-12-26 22:44:30 UTC (rev 27743)
@@ -66,8 +66,7 @@
// Complete white-space lines are to be ignored.
String trimmedLine = line.trim();
if (trimmedLine.length() > 0) {
-// sb.append(trimmedLine).append('\n');
- sb.append(trimmedLine);
+ sb.append(trimmedLine).append('\n');
}
}
return sb.toString();
14 years
JBoss Tools SVN: r27742 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client: utils and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-26 16:59:03 -0500 (Sun, 26 Dec 2010)
New Revision: 27742
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java
Log:
[JBIDE-7763] corrected key request to send commit=create
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2010-12-26 21:57:37 UTC (rev 27741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2010-12-26 21:59:03 UTC (rev 27742)
@@ -24,8 +24,8 @@
private String imageId;
private String profileId;
- private String realmId ;
- private String name ;
+ private String realmId;
+ private String name;
private String keyName;
private String memory;
private String storage;
@@ -33,7 +33,7 @@
public CreateInstanceRequest(URL baseUrl, String imageId) {
this(baseUrl, imageId, null, null, null, null, null, null);
}
-
+
public CreateInstanceRequest(URL baseUrl, String imageId, String profileId, String realmId, String name,
String keyname, String memory, String storage) {
super(baseUrl, HttpMethod.POST);
@@ -48,20 +48,15 @@
@Override
protected String doCreateUrl(UrlBuilder urlBuilder) {
- urlBuilder.path("instances").parameter("image_id", imageId);
- appendParameter("hwp_id", profileId, urlBuilder);
- appendParameter("realm_id", realmId, urlBuilder);
- appendParameter("name", name, urlBuilder);
- appendParameter("hwp_memory", memory, urlBuilder);
- appendParameter("hwp_storage", storage, urlBuilder);
- appendParameter("keyname", keyName, urlBuilder);
- appendParameter("commit", "create", urlBuilder);
- return urlBuilder.toString();
+ return urlBuilder.path("instances")
+ .parameter("image_id", imageId)
+ .parameter("hwp_id", profileId)
+ .parameter("realm_id", realmId)
+ .parameter("name", name)
+ .parameter("hwp_memory", memory)
+ .parameter("hwp_storage", storage)
+ .parameter("keyname", keyName)
+ .parameter("commit", "create")
+ .toString();
}
-
- private void appendParameter(String parameterName, String parameterValue, UrlBuilder urlBuilder) {
- if (parameterValue != null) {
- urlBuilder.parameter(parameterName, parameterValue);
- }
- }
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java 2010-12-26 21:57:37 UTC (rev 27741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateKeyRequest.java 2010-12-26 21:59:03 UTC (rev 27742)
@@ -31,6 +31,9 @@
@Override
protected String doCreateUrl(UrlBuilder urlBuilder) {
- return urlBuilder.path("keys").parameter("name", keyName).toString();
+ return urlBuilder.path("keys")
+ .parameter("name", keyName)
+ .parameter("commit", "create")
+ .toString();
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java 2010-12-26 21:57:37 UTC (rev 27741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java 2010-12-26 21:59:03 UTC (rev 27742)
@@ -33,11 +33,11 @@
public UrlBuilder() {
}
-
+
public UrlBuilder(URL baseUrl) {
urlStringBuilder.append(baseUrl.toString());
}
-
+
/**
* adds a host to .
*
@@ -86,11 +86,14 @@
}
return this;
}
-
+
public UrlBuilder parameter(String name, String value) {
- appendParameterDelimiter();
- urlStringBuilder.append(name).append(PARAMETER_NAME_VALUE_DELIMITER).append(value);
+ if (value != null) {
+ appendParameterDelimiter();
+ urlStringBuilder.append(name).append(PARAMETER_NAME_VALUE_DELIMITER).append(value);
+ }
return this;
+
}
private void appendParameterDelimiter() {
@@ -108,13 +111,13 @@
}
return this;
}
-
+
public UrlBuilder parameter(String parameter) {
appendParameterDelimiter();
urlStringBuilder.append(parameter);
return this;
}
-
+
public URL toUrl() throws MalformedURLException {
return new URL(urlStringBuilder.toString());
}
14 years
JBoss Tools SVN: r27741 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-26 16:57:37 -0500 (Sun, 26 Dec 2010)
New Revision: 27741
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java
Log:
[JBIDE-7763] revamped the whole manage keys page to deal with keys on the server (list, refresh, create, delete)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java 2010-12-26 09:59:29 UTC (rev 27740)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java 2010-12-26 21:57:37 UTC (rev 27741)
@@ -50,8 +50,8 @@
private String storage;
private String memory;
- protected NewInstancePageModel(String keyname, DeltaCloudImage image) {
- this.keyId = keyname;
+ protected NewInstancePageModel(String keyId, DeltaCloudImage image) {
+ this.keyId = keyId;
this.image = image;
}
@@ -173,8 +173,8 @@
return keyId;
}
- public void setKeyname(String keyname) {
- getPropertyChangeSupport().firePropertyChange(PROPERTY_KEYID, this.keyId, this.keyId = keyname);
+ public void setKeyId(String keyId) {
+ getPropertyChangeSupport().firePropertyChange(PROPERTY_KEYID, this.keyId, this.keyId = keyId);
}
public String getArch() {
14 years
JBoss Tools SVN: r27740 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-26 04:59:29 -0500 (Sun, 26 Dec 2010)
New Revision: 27740
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java
Log:
[JBIDE-7763] now storing the key in the local .ssh folder
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-25 15:27:49 UTC (rev 27739)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ManageKeysPage.java 2010-12-26 09:59:29 UTC (rev 27740)
@@ -271,7 +271,7 @@
try {
DeltaCloudKey key = model.createKey(keyId);
// I guess that the launch job stores the key in the appropriate place already
-// PemFileFactory.create(key);
+ PemFileFactory.create(key);
} catch (Exception e) {
// TODO: internationalize strings
ErrorUtils.handleError(
14 years