Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2015-11-30 01:51:43 +0000
committerslewis2015-11-30 01:51:43 +0000
commitcd82587548f4e2eaa6b426e2d418360da30d3df7 (patch)
tree065c9aff2e2393ca24423f9c9309e63eace03806 /framework
parent2c4cd3e147537414bbe618a97cedef315c0462f9 (diff)
downloadorg.eclipse.ecf-cd82587548f4e2eaa6b426e2d418360da30d3df7.tar.gz
org.eclipse.ecf-cd82587548f4e2eaa6b426e2d418360da30d3df7.tar.xz
org.eclipse.ecf-cd82587548f4e2eaa6b426e2d418360da30d3df7.zip
Fix bug created in previous commitR-Release_HEAD-sdk_feature-174_174
Diffstat (limited to 'framework')
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java4
-rw-r--r--framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java
index 2904316d5..b8a6d52fa 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/endpoint/model/EndpointNode.java
@@ -24,9 +24,9 @@ public class EndpointNode extends AbstractEndpointNode {
this.endpointDescription = ed;
}
- @Deprecated
public EndpointNode(EndpointDescription ed, ImportRegistrationNode irn) {
-
+ this.endpointDescription = ed;
+ this.importReference = (ImportReference) irn.getImportRegistration().getImportReference();
}
/**
* @since 3.3
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java
index 0e693443f..f4bcb3939 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/remoteserviceadmin/ui/rsa/model/EndpointDescriptionRSANode.java
@@ -13,6 +13,7 @@ import java.util.Map;
import org.eclipse.ecf.internal.remoteservices.ui.Messages;
import org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescription;
+import org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin.ImportReference;
import org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin.ImportRegistration;
import org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model.EndpointAsyncInterfacesNode;
import org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model.EndpointConfigTypesNode;
@@ -48,8 +49,7 @@ public class EndpointDescriptionRSANode extends AbstractRSANode {
public EndpointDescriptionRSANode(EndpointDescription ed, ImportRegistration ir) {
this.endpointNode = (ir == null) ? new EndpointNode(ed)
- : new EndpointNode(ed,
- new org.eclipse.ecf.remoteserviceadmin.ui.endpoint.model.ImportRegistrationNode(ir));
+ : new EndpointNode(ed, (ImportReference) ir.getImportReference());
// Interfaces
EndpointInterfacesNode ein = new EndpointInterfacesNode();
for (String intf : ed.getInterfaces())

Back to the top