Author: anil
Date: Thu Jun 16 00:23:33 2005
New Revision: 190883
URL: http://svn.apache.org/viewcvs?rev=190883&view=rev
Log:
Description fix
Modified:
webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java
Modified:
webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java
URL:
http://svn.apache.org/viewcvs/webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java?rev=190883&r1=190882&r2=190883&view=diff
==============================================================================
---
webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java
(original)
+++
webservices/scout/trunk/modules/scout/src/java/org/apache/ws/scout/util/ScoutUddiJaxrHelper.java
Thu Jun 16 00:23:33 2005
@@ -68,22 +68,14 @@
throws JAXRException
{
Vector namevect = entity.getNameVector();
- Name n = (Name)namevect.elementAt(0);
- String name = n.getValue();
+ Name n = namevect != null ? (Name)namevect.elementAt(0) : null;
+ String name = n != null ? n.getValue() : null;
Vector descvect = entity.getDescriptionVector();
-
- Description desc = null;
-
- if (descvect != null && descvect.size() > 0) {
- desc = (Description)descvect.elementAt(0);
- }
- else {
- desc = new Description("");
- }
+ Description desc = descvect != null ?
(Description)descvect.elementAt(0): null;
Organization org = new OrganizationImpl(lcm);
- org.setName(getIString(name, lcm));
- org.setDescription(getIString((String)desc.getValue(), lcm));
+ if(name != null ) org.setName(getIString(name, lcm));
+ if( desc != null) org.setDescription(getIString((String)desc.getValue(),
lcm));
org.setKey(lcm.createKey(entity.getBusinessKey()));
//Set Services also
@@ -168,22 +160,14 @@
BusinessEntity entity = (BusinessEntity)bz.elementAt(0);
Vector namevect = entity.getNameVector();
- Name n = (Name)namevect.elementAt(0);
- String name = n.getValue();
+ Name n = namevect != null ? (Name)namevect.elementAt(0) : null;
+ String name = n != null ? n.getValue(): null;
Vector descvect = entity.getDescriptionVector();
-
- Description desc = null;
-
- if (descvect != null && descvect.size() > 0) {
- desc = (Description)descvect.elementAt(0);
- }
- else {
- desc = new Description("");
- }
+ Description desc = descvect != null? (Description)descvect.elementAt(0)
: null;
Organization org = new OrganizationImpl(lcm);
- org.setName(getIString(name, lcm));
- org.setDescription(getIString((String)desc.getValue(), lcm));
+ if( name != null ) org.setName(getIString(name, lcm));
+ if( desc != null )
org.setDescription(getIString((String)desc.getValue(), lcm));
org.setKey(lcm.createKey(entity.getBusinessKey()));
//Set Services also
@@ -205,7 +189,7 @@
* depend on that behavior
*/
Contacts contacts = entity.getContacts();
- Vector cvect = contacts.getContactVector();
+ Vector cvect = contacts != null ? contacts.getContactVector():null;
for (int i = 0; cvect != null && i < cvect.size(); i++)
{
Contact contact = (Contact)cvect.elementAt(i);
@@ -281,17 +265,8 @@
String name = n.getValue();
serve.setName(lcm.createInternationalString(name));
Vector descvect = bs.getDescriptionVector();
-
- Description desc = null;
-
- if (descvect != null && descvect.size() > 0) {
- desc = (Description)descvect.elementAt(0);
- }
- else {
- desc = new Description("");
- }
-
- serve.setDescription(lcm.createInternationalString(desc.getValue()));
+ Description desc = descvect != null ? (Description)descvect.elementAt(0)
: null;
+ if(desc != null )
serve.setDescription(lcm.createInternationalString(desc.getValue()));
return serve;
}
@@ -334,6 +309,8 @@
svc.setKey(lcm.createKey(keystr));
((ServiceBindingImpl)serve).setService(svc);
}
+ String bindingKey = bs.getBindingKey();
+ if(bindingKey != null) serve.setKey(new KeyImpl(bindingKey));
//TODO:Add more stuff
//Access URI
AccessPoint access = bs.getAccessPoint();
@@ -360,17 +337,8 @@
concept.setName(lcm.createInternationalString(tmodel.getName()));
Vector descvect = tmodel.getDescriptionVector();
-
- Description desc = null;
-
- if (descvect != null && descvect.size() > 0) {
- desc = (Description) descvect.elementAt(0);
- }
- else {
- desc = new Description("");
- }
-
- concept.setDescription(lcm.createInternationalString(desc.getValue()));
+ Description desc = getDescription(tmodel);
+ if( desc != null )
concept.setDescription(lcm.createInternationalString(desc.getValue()));
return concept;
}
@@ -383,16 +351,7 @@
concept.setName(lcm.createInternationalString(tmodel.getName()));
Vector descvect = tmodel.getDescriptionVector();
-
- Description desc = null;
-
- if (descvect != null && descvect.size() > 0) {
- desc = (Description) descvect.elementAt(0);
- }
- else {
- desc = new Description("");
- }
-
+ Description desc = getDescription(tmodel);
concept.setDescription(lcm.createInternationalString(desc.getValue()));
return concept;
@@ -406,6 +365,13 @@
concept.setName(lcm.createInternationalString(tm.getName().getValue()));
return concept;
+ }
+
+ private static Description getDescription( TModel tmodel )
+ {
+ Vector descvect = tmodel.getDescriptionVector();
+ Description desc = descvect != null ? (Description)descvect.elementAt(0)
: null;
+ return desc;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
