Author: kstam
Date: Fri Jun 29 14:59:52 2007
New Revision: 552045
URL: http://svn.apache.org/viewvc?view=rev&rev=552045
Log:
SCOUT-37, Cleaning up warnings.
Modified:
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/RegistryException.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/AssociationImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ClassificationSchemeImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ConceptImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/InternationalStringImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryEntryImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryObjectImpl.java
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/SlotImpl.java
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java
Modified:
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java
(original)
+++
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/LifeCycleManager.java
Fri Jun 29 14:59:52 2007
@@ -144,7 +144,7 @@
ServiceBinding createServiceBinding() throws JAXRException;
- Slot createSlot(String name, Collection values, String slotType) throws
JAXRException;
+ Slot createSlot(String name, Collection<String> values, String slotType)
throws JAXRException;
Slot createSlot(String name, String value, String slotType) throws
JAXRException;
Modified:
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java
(original)
+++
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ClassificationScheme.java
Fri Jun 29 14:59:52 2007
@@ -36,7 +36,7 @@
void addChildConcept(Concept concept) throws JAXRException;
- void addChildConcepts(Collection concepts) throws JAXRException;
+ void addChildConcepts(Collection<Concept> concepts) throws JAXRException;
int getChildConceptCount() throws JAXRException;
@@ -50,7 +50,7 @@
void removeChildConcept(Concept concept) throws JAXRException;
- void removeChildConcepts(Collection concepts) throws JAXRException;
+ void removeChildConcepts(Collection<Concept> concepts) throws
JAXRException;
void setValueType(int valueType) throws JAXRException;
}
Modified:
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java
(original)
+++
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Concept.java
Fri Jun 29 14:59:52 2007
@@ -32,15 +32,15 @@
public interface Concept extends RegistryObject {
void addChildConcept(Concept concept) throws JAXRException;
- void addChildConcepts(Collection concepts) throws JAXRException;
+ void addChildConcepts(Collection<Concept> concepts) throws JAXRException;
int getChildConceptCount() throws JAXRException;
- Collection getChildrenConcepts() throws JAXRException;
+ Collection<Concept> getChildrenConcepts() throws JAXRException;
ClassificationScheme getClassificationScheme() throws JAXRException;
- Collection getDescendantConcepts() throws JAXRException;
+ Collection<Concept> getDescendantConcepts() throws JAXRException;
RegistryObject getParent() throws JAXRException;
@@ -52,7 +52,7 @@
void removeChildConcept(Concept concept) throws JAXRException;
- void removeChildConcepts(Collection concepts) throws JAXRException;
+ void removeChildConcepts(Collection<Concept> concepts) throws
JAXRException;
void setValue(String value) throws JAXRException;
}
Modified:
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java
(original)
+++
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/ExtensibleObject.java
Fri Jun 29 14:59:52 2007
@@ -40,5 +40,5 @@
void removeSlot(String slotName) throws JAXRException;
- void removeSlots(Collection slotNames) throws JAXRException;
+ void removeSlots(Collection<String> slotNames) throws JAXRException;
}
Modified:
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java
(original)
+++
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/RegistryObject.java
Fri Jun 29 14:59:52 2007
@@ -41,11 +41,11 @@
void addExternalIdentifier(ExternalIdentifier externalIdentifier) throws
JAXRException;
- void addExternalIdentifiers(Collection externalIdentifiers) throws
JAXRException;
+ void addExternalIdentifiers(Collection<ExternalIdentifier>
externalIdentifiers) throws JAXRException;
void addExternalLink(ExternalLink externalLink) throws JAXRException;
- void addExternalLinks(Collection externalLinks) throws JAXRException;
+ void addExternalLinks(Collection<ExternalLink> externalLinks) throws
JAXRException;
Collection getAssociatedObjects() throws JAXRException;
@@ -57,9 +57,9 @@
InternationalString getDescription() throws JAXRException;
- Collection getExternalIdentifiers() throws JAXRException;
+ Collection<ExternalIdentifier> getExternalIdentifiers() throws
JAXRException;
- Collection getExternalLinks() throws JAXRException;
+ Collection<ExternalLink> getExternalLinks() throws JAXRException;
Key getKey() throws JAXRException;
@@ -79,7 +79,7 @@
void removeClassification(Classification classification) throws
JAXRException;
- void removeClassifications(Collection classifications) throws
JAXRException;
+ void removeClassifications(Collection<Classification> classifications)
throws JAXRException;
void removeExternalIdentifier(ExternalIdentifier externalIdentifier)
throws JAXRException;
@@ -93,11 +93,11 @@
void setDescription(InternationalString description) throws JAXRException;
- void setClassifications(Collection classifications) throws JAXRException;
+ void setClassifications(Collection<Classification> classifications) throws
JAXRException;
- void setExternalIdentifiers(Collection externalIdentifiers) throws
JAXRException;
+ void setExternalIdentifiers(Collection<ExternalIdentifier>
externalIdentifiers) throws JAXRException;
- void setExternalLinks(Collection externalLinks) throws JAXRException;
+ void setExternalLinks(Collection<ExternalLink> externalLinks) throws
JAXRException;
void setKey(Key key) throws JAXRException;
Modified:
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java
(original)
+++
webservices/scout/trunk/jaxr-api/src/main/java/javax/xml/registry/infomodel/Slot.java
Fri Jun 29 14:59:52 2007
@@ -39,11 +39,11 @@
String getSlotType() throws JAXRException;
- Collection getValues() throws JAXRException;
+ Collection<String> getValues() throws JAXRException;
void setName(String name) throws JAXRException;
void setSlotType(String slotType) throws JAXRException;
- void setValues(Collection values) throws JAXRException;
+ void setValues(Collection<String> values) throws JAXRException;
}
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/BusinessLifeCycleManagerImpl.java
Fri Jun 29 14:59:52 2007
@@ -77,7 +77,9 @@
public class BusinessLifeCycleManagerImpl extends LifeCycleManagerImpl
implements BusinessLifeCycleManager, Serializable {
- private Log log = LogFactory.getLog(this.getClass());
+
+ private static final long serialVersionUID = 1L;
+ private Log log = LogFactory.getLog(this.getClass());
public BusinessLifeCycleManagerImpl(RegistryService registry) {
super(registry);
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionFactoryImpl.java
Fri Jun 29 14:59:52 2007
@@ -39,6 +39,7 @@
*/
public class ConnectionFactoryImpl extends ConnectionFactory implements
Serializable
{
+ private static final long serialVersionUID = 1L;
private static final String QUERYMANAGER_PROPERTY =
"javax.xml.registry.queryManagerURL";
private static final String LIFECYCLEMANAGER_PROPERTY =
"javax.xml.registry.lifeCycleManagerURL";
private static final String SEMANTICEQUIVALENCES_PROPERTY =
"javax.xml.registry.semanticEquivalences";
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/ConnectionImpl.java
Fri Jun 29 14:59:52 2007
@@ -33,6 +33,7 @@
*/
public class ConnectionImpl implements Connection, Serializable
{
+ private static final long serialVersionUID = 1L;
private boolean closed = false;
private boolean synchronous = true;
private Set credentials;
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/LifeCycleManagerImpl.java
Fri Jun 29 14:59:52 2007
@@ -355,7 +355,7 @@
}
public Slot createSlot(String name, String value, String slotType) throws
JAXRException {
- Collection col = new ArrayList();
+ Collection<String> col = new ArrayList<String>();
col.add(value);
Slot slot = (Slot) this.createObject(LifeCycleManager.SLOT);
slot.setName(name);
@@ -364,7 +364,7 @@
return slot;
}
- public Slot createSlot(String name, Collection values, String slotType)
throws JAXRException {
+ public Slot createSlot(String name, Collection<String> values, String
slotType) throws JAXRException {
Slot slot = (Slot) this.createObject(LifeCycleManager.SLOT);
slot.setName(name);
slot.setValues(values);
@@ -463,7 +463,7 @@
org.setDescription(createInternationalString(((Description)
descriptions[0]).getStringValue()));
}
if (serviceInfos != null && serviceInfos.length > 0) {
- List services = new ArrayList(serviceInfos.length);
+ List<Service> services = new
ArrayList<Service>(serviceInfos.length);
for (int i = 0; i < serviceInfos.length; i++) {
ServiceInfo serviceInfo = (ServiceInfo) serviceInfos[i];
services.add(createService(serviceInfo));
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/RegistryException.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/RegistryException.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/RegistryException.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/RegistryException.java
Fri Jun 29 14:59:52 2007
@@ -29,7 +29,7 @@
*/
public class RegistryException extends Exception
{
-
+ private static final long serialVersionUID = 1L;
public static final int E_ASSERTION_NOT_FOUND = 30000;
public static final int E_AUTH_TOKEN_EXPIRED = 10110;
public static final int E_AUTH_TOKEN_REQUIRED = 10120;
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/AssociationImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/AssociationImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/AssociationImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/AssociationImpl.java
Fri Jun 29 14:59:52 2007
@@ -118,7 +118,7 @@
else
id+=":"+k.getId();
id += ":" + "Concept"; //UDDI: KeyedReference->Key Name
- String val = "NULL";
+ //String val = "NULL"; KS unused
if(type!= null) id += ":" + type.getValue();
else id +=":NULL";
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ClassificationSchemeImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ClassificationSchemeImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ClassificationSchemeImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ClassificationSchemeImpl.java
Fri Jun 29 14:59:52 2007
@@ -38,9 +38,9 @@
implements ClassificationScheme
{
- private Collection childConcepts = new ArrayList();
+ private Collection<Concept> childConcepts = new ArrayList<Concept>();
- private int valueType = 1;
+ //private int valueType = 1; KS: not used.
private boolean external = false;
@@ -58,7 +58,7 @@
childConcepts.add(concept);
}
- public void addChildConcepts(Collection collection)
+ public void addChildConcepts(Collection<Concept> collection)
throws JAXRException
{
childConcepts.addAll(collection);
@@ -77,7 +77,7 @@
public Collection getDescendantConcepts() throws JAXRException
{
- Collection coll = new ArrayList();
+ Collection<Concept> coll = new ArrayList<Concept>();
Iterator iter = childConcepts.iterator();
while(iter != null && iter.hasNext())
{
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ConceptImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ConceptImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ConceptImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ConceptImpl.java
Fri Jun 29 14:59:52 2007
@@ -40,7 +40,7 @@
private Concept parentconcept = null;
private ClassificationScheme scheme = null;
- private Collection childconcepts = new ArrayList();
+ private Collection<Concept> childconcepts = new ArrayList<Concept>();
/**
* Creates a new instance of ConceptImpl
@@ -56,7 +56,7 @@
((ConceptImpl)concept).setParentconcept(this);
}
- public void addChildConcepts(Collection collection)
+ public void addChildConcepts(Collection<Concept> collection)
{
Iterator iter = collection.iterator();
while(iter.hasNext())
@@ -73,7 +73,7 @@
return this.childconcepts.size();
}
- public Collection getChildrenConcepts()
+ public Collection<Concept> getChildrenConcepts()
{
return this.childconcepts;
}
@@ -83,9 +83,9 @@
return scheme;
}
- public Collection getDescendantConcepts()
+ public Collection<Concept> getDescendantConcepts()
{
- Collection coll = new ArrayList();
+ Collection<Concept> coll = new ArrayList<Concept>();
Iterator iter = childconcepts.iterator();
while(iter != null && iter.hasNext())
{
@@ -154,7 +154,7 @@
this.scheme = scheme;
}
- public void setChildconcepts(Collection childconcepts)
+ public void setChildconcepts(Collection<Concept> childconcepts)
{
this.childconcepts.clear();
Iterator iter = childconcepts.iterator();
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectImpl.java
Fri Jun 29 14:59:52 2007
@@ -32,7 +32,7 @@
*/
public class ExtensibleObjectImpl implements ExtensibleObject
{
- private Map slots = new HashMap();
+ private Map<String,Slot> slots = new HashMap<String,Slot>();
public void addSlot(Slot slot) throws JAXRException
{
@@ -52,7 +52,7 @@
return (Slot) slots.get(slotName);
}
- public Collection getSlots()
+ public Collection<Slot> getSlots()
{
return slots.values();
}
@@ -62,7 +62,7 @@
slots.remove(slotName);
}
- public void removeSlots(Collection slotNames)
+ public void removeSlots(Collection<String> slotNames)
{
slots.keySet().removeAll(slotNames);
}
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/InternationalStringImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/InternationalStringImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/InternationalStringImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/InternationalStringImpl.java
Fri Jun 29 14:59:52 2007
@@ -37,7 +37,7 @@
/**
* Maintains an Hashmap of locale to string value
*/
- private final Map map = new HashMap();
+ private final Map<MapKey,LocalizedString> map = new
HashMap<MapKey,LocalizedString>();
public InternationalStringImpl()
{
@@ -71,7 +71,7 @@
}
}
- public Collection getLocalizedStrings() throws JAXRException
+ public Collection<LocalizedString> getLocalizedStrings() throws
JAXRException
{
return Collections.unmodifiableCollection(map.values());
}
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryEntryImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryEntryImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryEntryImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryEntryImpl.java
Fri Jun 29 14:59:52 2007
@@ -31,13 +31,13 @@
*/
public class RegistryEntryImpl extends RegistryObjectImpl implements
RegistryEntry
{
- private Date expiry = null;
- private int major = 1;
- private int minor = 0;
- private int stability = 1;
- private int status = 1;
+ //private Date expiry = null;
+ //private int major = 1;
+ //private int minor = 0;
+ //private int stability = 1;
+ //private int status = 1;
- private String userversion = new String();
+ //private String userversion = new String();
/**
* Creates a new instance of RegistryEntryImpl
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryObjectImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryObjectImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryObjectImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/RegistryObjectImpl.java
Fri Jun 29 14:59:52 2007
@@ -50,10 +50,10 @@
private InternationalString name = new InternationalStringImpl();
private InternationalString desc = new InternationalStringImpl();
- private Set classifications = new HashSet();
- private Set associations = new HashSet();
- private Set externalIds = new HashSet();
- private Set externalLinks = new HashSet();
+ private Set<Classification> classifications = new
HashSet<Classification>();
+ private Set<Association> associations = new HashSet<Association>();
+ private Set<ExternalIdentifier> externalIds = new
HashSet<ExternalIdentifier>();
+ private Set<ExternalLink> externalLinks = new HashSet<ExternalLink>();
private OrganizationImpl submittingOrganization;
@@ -124,7 +124,7 @@
classifications.remove(classification);
}
- public void removeClassifications(Collection collection)
+ public void removeClassifications(Collection<Classification> collection)
{
classifications.removeAll(collection);
}
@@ -134,9 +134,9 @@
return Collections.unmodifiableSet(classifications);
}
- public void setClassifications(Collection collection)
+ public void setClassifications(Collection<Classification> collection)
{
- Set newClassifications = new HashSet(collection.size());
+ Set<Classification> newClassifications = new
HashSet<Classification>(collection.size());
for (Iterator i = collection.iterator(); i.hasNext();)
{
Classification classification = (Classification) i.next();
@@ -171,14 +171,14 @@
}
}
- public Collection getAssociations() throws JAXRException
+ public Collection<Association> getAssociations() throws JAXRException
{
return Collections.unmodifiableSet(associations);
}
public void setAssociations(Collection collection)
{
- Set newAssociations = new HashSet(collection.size());
+ Set<Association> newAssociations = new
HashSet<Association>(collection.size());
for (Iterator i = collection.iterator(); i.hasNext();)
{
Association association = (Association) i.next();
@@ -233,14 +233,14 @@
externalIds.removeAll(collection);
}
- public Collection getExternalIdentifiers()
+ public Collection<ExternalIdentifier> getExternalIdentifiers()
{
return Collections.unmodifiableSet(externalIds);
}
- public void setExternalIdentifiers(Collection collection)
+ public void setExternalIdentifiers(Collection<ExternalIdentifier>
collection)
{
- Set newExternalIds = new HashSet(collection.size());
+ Set<ExternalIdentifier> newExternalIds = new
HashSet<ExternalIdentifier>(collection.size());
for (Iterator i = collection.iterator(); i.hasNext();)
{
ExternalIdentifier externalId = (ExternalIdentifier) i.next();
@@ -255,7 +255,7 @@
((ExternalLinkImpl) externalLink).addLinkedObject(this);
}
- public void addExternalLinks(Collection collection)
+ public void addExternalLinks(Collection<ExternalLink> collection)
{
for (Iterator i = collection.iterator(); i.hasNext();)
{
@@ -282,14 +282,14 @@
externalLinks.removeAll(collection);
}
- public Collection getExternalLinks()
+ public Collection<ExternalLink> getExternalLinks()
{
return Collections.unmodifiableSet(externalLinks);
}
- public void setExternalLinks(Collection collection)
+ public void setExternalLinks(Collection<ExternalLink> collection)
{
- Set newExternalLinks = new HashSet(collection.size());
+ Set<ExternalLink> newExternalLinks = new
HashSet<ExternalLink>(collection.size());
for (Iterator i = collection.iterator(); i.hasNext();)
{
ExternalLink externalLink = (ExternalLink) i.next();
Modified:
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/SlotImpl.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/SlotImpl.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/SlotImpl.java
(original)
+++
webservices/scout/trunk/scout/src/main/java/org/apache/ws/scout/registry/infomodel/SlotImpl.java
Fri Jun 29 14:59:52 2007
@@ -33,8 +33,9 @@
{
private String slotType;
private String name;
- private Collection values;
+ private Collection<String> values;
+ @SuppressWarnings("unchecked")
public SlotImpl()
{
values = Collections.EMPTY_SET;
@@ -50,7 +51,7 @@
return slotType;
}
- public Collection getValues() throws JAXRException
+ public Collection<String> getValues() throws JAXRException
{
return values;
}
@@ -65,7 +66,7 @@
slotType = s;
}
- public void setValues(Collection collection) throws JAXRException
+ public void setValues(Collection<String> collection) throws JAXRException
{
if (collection == null)
{
@@ -73,7 +74,7 @@
}
// "the value of a Slot is locally unique within a slot instance"
// to enforce this, convert the supplied Collection to a Set
- values = new HashSet(collection);
+ values = new HashSet<String>(collection);
}
/**
Modified:
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java
URL:
http://svn.apache.org/viewvc/webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java?view=diff&rev=552045&r1=552044&r2=552045
==============================================================================
---
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java
(original)
+++
webservices/scout/trunk/scout/src/test/java/org/apache/ws/scout/registry/infomodel/ExtensibleObjectTest.java
Fri Jun 29 14:59:52 2007
@@ -114,7 +114,7 @@
return null;
}
- public Collection getValues() throws JAXRException {
+ public Collection<String> getValues() throws JAXRException {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
