diff options
| author | abranson <andrew.branson@cern.ch> | 2011-08-04 00:42:34 +0200 |
|---|---|---|
| committer | abranson <andrew.branson@cern.ch> | 2011-08-04 00:42:34 +0200 |
| commit | 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 (patch) | |
| tree | 5f6e5d9ae75193e67e6f3b3dfa488960c5cde1d5 /source/com/c2kernel/collection | |
| parent | 036cbdba66f804743c4c838ed598d6972c4b3e17 (diff) | |
More code cleanup:
Refactored Entity Proxy Subscription to handle generics better
Rewrote RemoteMap to use TreeMap instead of the internal array for
order. It now sorts its keys by number if they parse, else as strings.
Removed a no-longer-in-progress outcome form class
Diffstat (limited to 'source/com/c2kernel/collection')
17 files changed, 256 insertions, 205 deletions
diff --git a/source/com/c2kernel/collection/Aggregation.java b/source/com/c2kernel/collection/Aggregation.java index 72b8005..29cb067 100755..100644 --- a/source/com/c2kernel/collection/Aggregation.java +++ b/source/com/c2kernel/collection/Aggregation.java @@ -1,29 +1,31 @@ package com.c2kernel.collection;
-import java.util.Iterator;
import com.c2kernel.collection.gui.model.AggregationVertexOutlineCreator;
-import com.c2kernel.graph.model.*;
-import com.c2kernel.utils.*;
+import com.c2kernel.graph.model.GraphModel;
+import com.c2kernel.graph.model.GraphPoint;
+import com.c2kernel.graph.model.TypeNameAndConstructionInfo;
+import com.c2kernel.utils.CastorHashMap;
+import com.c2kernel.utils.Language;
+import com.c2kernel.utils.Logger;
/**
* @version $Revision: 1.59 $ $Date: 2004/08/10 07:56:08 $
* @author $Author: abranson $
*/
-abstract public class Aggregation extends Parent2ChildCollection
+abstract public class Aggregation extends Parent2ChildCollection<AggregationMember>
{
protected GraphModel mLayout = new GraphModel(new AggregationVertexOutlineCreator());
private final TypeNameAndConstructionInfo[] mVertexTypeNameAndConstructionInfo = {
- new TypeNameAndConstructionInfo(Language.translate("Slot"), "AggregationMember")
+ new TypeNameAndConstructionInfo(Language.translate("Slot"), "AggregationMember")
};
public Aggregation()
{
setName("Aggregation");
- mMembers = new CollectionMemberList();
}
@@ -46,22 +48,22 @@ abstract public class Aggregation extends Parent2ChildCollection {
for (int i=0; i<size(); i++)
{
- AggregationMember element = (AggregationMember) mMembers.list.get(i);
+ AggregationMember element = mMembers.list.get(i);
if (element.getEntityKey() == entityKey)
return true;
}
- return false;
+ return false;
}
public AggregationMember getMemberPair(int vertexID)
{
for (int i=0; i<size(); i++)
{
- AggregationMember element = (AggregationMember) mMembers.list.get(i);
+ AggregationMember element = mMembers.list.get(i);
if (element.getID() == vertexID)
return element;
}
- return null;
+ return null;
}
public void addMember(int entityKey, CastorHashMap props, String classProps, GraphPoint location, int w, int h)
@@ -86,19 +88,21 @@ abstract public class Aggregation extends Parent2ChildCollection }
- public void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException
+ @Override
+ public void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException
{
addMember(entityKey, props, classProps, new GraphPoint(100,100*getCounter()), 20, 20);
}
-
- public void addMember(int entityKey) throws MembershipException {
+
+ @Override
+ public void addMember(int entityKey) throws MembershipException {
throw new MembershipException("Aggregations cannot accept arbitrary members without type info");
-
+
}
- public void removeMember(int memberId) throws MembershipException {
- for (Iterator iter = mMembers.list.iterator(); iter.hasNext();) {
- AggregationMember element = (AggregationMember)iter.next();
+ @Override
+ public void removeMember(int memberId) throws MembershipException {
+ for (AggregationMember element : mMembers.list) {
if (element.getID() == memberId) {
element.clearEntity();
mLayout.removeVertex(getLayout().getVertexById(memberId));
diff --git a/source/com/c2kernel/collection/AggregationDescription.java b/source/com/c2kernel/collection/AggregationDescription.java index 07a6818..a046871 100755..100644 --- a/source/com/c2kernel/collection/AggregationDescription.java +++ b/source/com/c2kernel/collection/AggregationDescription.java @@ -6,54 +6,54 @@ package com.c2kernel.collection; */
import com.c2kernel.graph.model.Vertex;
-import com.c2kernel.property.*;
+import com.c2kernel.property.PropertyDescriptionList;
+import com.c2kernel.property.PropertyUtility;
import com.c2kernel.utils.Logger;
-public class AggregationDescription extends Aggregation implements CollectionDescription
+public class AggregationDescription extends Aggregation implements CollectionDescription<AggregationMember>
{
public AggregationDescription()
{
setName("AggregationDescription");
- mMembers = new CollectionMemberList();
}
public AggregationDescription(String name)
{
setName(name);
- mMembers = new CollectionMemberList();
}
-
- public Collection newInstance()
+
+ @Override
+ public Aggregation newInstance()
{
AggregationInstance newInstance = new AggregationInstance(getName());
newInstance.setURLInfo(getURLInfo());
//for each desc member
for (int i=0; i<size(); i++)
{
- AggregationMember mem = (AggregationMember) mMembers.list.get(i);
- //get the propdesc of the member item
+ AggregationMember mem = mMembers.list.get(i);
+ //get the propdesc of the member item
PropertyDescriptionList pdList = PropertyUtility.getPropertyDescriptionOutcome(mem.getEntityKey());
if (pdList!=null)
{
- //create the new props of the member object
+ //create the new props of the member object
try {
Vertex v = getLayout().getVertexById(mem.getID());
- newInstance.addMember(-1, PropertyUtility.createProperty(pdList), pdList.getClassProps(),v.getCentrePoint(),v.getWidth(),v.getHeight());
- } catch (MembershipException e) {
+ newInstance.addMember(-1, PropertyUtility.createProperty(pdList), pdList.getClassProps(),v.getCentrePoint(),v.getWidth(),v.getHeight());
+ } catch (MembershipException e) {
// won't happen as we're not assigning an entity
}
}
else
- {
+ {
Logger.error("AggregationDescription::newInstance() There is no PropertyDescription. Cannot instantiate. " + mem.getEntityKey());
return null;
- }
+ }
}
return newInstance;
- }
+ }
}
diff --git a/source/com/c2kernel/collection/AggregationInstance.java b/source/com/c2kernel/collection/AggregationInstance.java index 0fbbf71..2eca928 100755..100644 --- a/source/com/c2kernel/collection/AggregationInstance.java +++ b/source/com/c2kernel/collection/AggregationInstance.java @@ -14,32 +14,32 @@ public class AggregationInstance extends Aggregation public AggregationInstance()
{
setName("AggregationInstance");
- mMembers = new CollectionMemberList();
}
public AggregationInstance(String name)
{
setName(name);
- mMembers = new CollectionMemberList();
}
-
- public void addMember(int entityKey, CastorHashMap props, String classProps)
+
+ @Override
+ public void addMember(int entityKey, CastorHashMap props, String classProps)
throws MembershipException
- {
+ {
if( entityKey!=-1 && exists(entityKey))
throw new MembershipException(entityKey+" already exists in this collection.");
else
super.addMember(entityKey, props, classProps);
}
- public void addMember(int entityKey, CastorHashMap props, String classProps, GraphPoint location, int w, int h)
+ @Override
+ public void addMember(int entityKey, CastorHashMap props, String classProps, GraphPoint location, int w, int h)
throws MembershipException
{
if( entityKey!=-1 && exists(entityKey))
throw new MembershipException(entityKey+" already exists in this collection.");
else
super.addMember(entityKey, props, classProps, location, w, h);
- }
+ }
}
diff --git a/source/com/c2kernel/collection/AggregationMember.java b/source/com/c2kernel/collection/AggregationMember.java index 753f503..d383f02 100755..100644 --- a/source/com/c2kernel/collection/AggregationMember.java +++ b/source/com/c2kernel/collection/AggregationMember.java @@ -27,8 +27,8 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb {
private int mEntityKey = -1;
- private EntityProxy mEntity = null;
- private Collection mCollection = null;
+ private EntityProxy mEntity = null;
+ private Aggregation mCollection = null;
private String mClassProps = null;
String entityName;
Image image;
@@ -44,50 +44,55 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb mCollection = null;
}
- public void setEntityKey(int entityKey) {
- mEntityKey = entityKey;
+ @Override
+ public void setEntityKey(int entityKey) {
+ mEntityKey = entityKey;
entityName = null;
}
-
- public void setCollection(Collection aggregation)
+
+ public void setCollection(Aggregation aggregation)
{
mCollection = aggregation;
}
- public void setClassProps(String props)
+ @Override
+ public void setClassProps(String props)
{
mClassProps = props;
}
- public int getEntityKey()
+ @Override
+ public int getEntityKey()
{
return mEntityKey;
}
- public Collection getCollection()
+ public Aggregation getCollection()
{
return mCollection;
}
- public String getClassProps()
+ @Override
+ public String getClassProps()
{
return mClassProps;
}
- public void assignEntity(int entityKey) throws MembershipException
+ @Override
+ public void assignEntity(int entityKey) throws MembershipException
{
if (entityKey > -1) {
if (mClassProps == null || getProperties() == null)
throw new MembershipException("ClassProps not yet set. Cannot check membership validity.");
-
+
//for each mandatory prop check if its in the member property and has the matching value
StringTokenizer sub = new StringTokenizer(mClassProps, ",");
while (sub.hasMoreTokens())
{
- String aClassProp = sub.nextToken();
- try {
- String memberValue = (String)getProperties().get(aClassProp);
- Property entityProperty = (Property)Gateway.getStorage().get(entityKey, ClusterStorage.PROPERTY+"/"+aClassProp, null);
+ String aClassProp = sub.nextToken();
+ try {
+ String memberValue = (String)getProperties().get(aClassProp);
+ Property entityProperty = (Property)Gateway.getStorage().get(entityKey, ClusterStorage.PROPERTY+"/"+aClassProp, null);
if (entityProperty == null)
throw new MembershipException("Property "+aClassProp+ " does not exist for entityKey=" + entityKey );
if (entityProperty.getValue() == null || !entityProperty.getValue().equalsIgnoreCase(memberValue))
@@ -96,25 +101,27 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb catch (MembershipException ex) {
throw ex;
}
- catch (Exception ex)
+ catch (Exception ex)
{
Logger.error(ex);
throw new MembershipException("Error checking properties");
}
- }
+ }
}
-
+
mEntityKey = entityKey;
mEntity = null;
entityName = null;
}
-
- public void clearEntity() {
+
+ @Override
+ public void clearEntity() {
mEntityKey = -1;
mEntity = null;
}
-
- public EntityProxy resolveEntity() throws ObjectNotFoundException {
+
+ @Override
+ public EntityProxy resolveEntity() throws ObjectNotFoundException {
if (mEntity == null) {
try {
EntityPath path = new EntityPath(mEntityKey);
@@ -124,9 +131,9 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb }
}
return mEntity;
-
+
}
-
+
public Image getImage() {
if (image == null) {
image = Resource.getImageResource("typeicons/"+getProperties().get("Type")+"_16.png").getImage();
@@ -147,7 +154,7 @@ public class AggregationMember extends GraphableVertex implements CollectionMemb else
entityName = "Empty";
}
-
+
return entityName;
}
diff --git a/source/com/c2kernel/collection/Collection.java b/source/com/c2kernel/collection/Collection.java index 745309c..f052ce9 100755..100644 --- a/source/com/c2kernel/collection/Collection.java +++ b/source/com/c2kernel/collection/Collection.java @@ -7,26 +7,26 @@ import com.c2kernel.utils.CastorHashMap; * @version $Revision: 1.13 $ $Date: 2004/05/14 15:39:39 $
* @author $Author: abranson $
*/
-public interface Collection extends C2KLocalObject
+public interface Collection<E extends CollectionMember> extends C2KLocalObject
{
public static final short EMPTY = -1;
-
+
public int getCounter();
public void setCounter(int count);
public int size();
- public void setMembers(CollectionMemberList newMembers);
+ public void setMembers(CollectionMemberList<E> newMembers);
- public CollectionMemberList getMembers();
+ public CollectionMemberList<E> getMembers();
public void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException;
-
+
public void addMember(int entityKey) throws MembershipException;
-
+
public void removeMember(int memberId) throws MembershipException;
-
+
public CollectionMember getMember(int memberId) throws ObjectNotFoundException;
-
+
}
diff --git a/source/com/c2kernel/collection/CollectionDescription.java b/source/com/c2kernel/collection/CollectionDescription.java index 01318ed..69b569e 100755..100644 --- a/source/com/c2kernel/collection/CollectionDescription.java +++ b/source/com/c2kernel/collection/CollectionDescription.java @@ -9,6 +9,6 @@ package com.c2kernel.collection; * All rights reserved.
**************************************************************************/
-public interface CollectionDescription extends Collection {
- public Collection newInstance();
+public interface CollectionDescription<E extends CollectionMember> extends Collection<E> {
+ public Collection<E> newInstance();
}
diff --git a/source/com/c2kernel/collection/CollectionMember.java b/source/com/c2kernel/collection/CollectionMember.java index 18b5d55..0b21e30 100755..100644 --- a/source/com/c2kernel/collection/CollectionMember.java +++ b/source/com/c2kernel/collection/CollectionMember.java @@ -10,7 +10,7 @@ import com.c2kernel.utils.CastorHashMap; * CollectionMember interface is the superclass of all members
* This should be temporary - if we manage to rip GraphableVertex from Vertex,
* then that should be the superclass.
- *
+ *
* $Revision: 1.19 $
* $Date: 2004/01/22 11:24:44 $
*
@@ -22,17 +22,17 @@ public interface CollectionMember extends Serializable { public void setEntityKey(int entityKey) throws MembershipException;
public int getEntityKey();
-
+
public void assignEntity(int entityKey) throws MembershipException;
public void clearEntity();
public EntityProxy resolveEntity() throws ObjectNotFoundException;
-
+
public void setID(int Id);
public int getID();
-
+
public void setProperties(CastorHashMap props);
public CastorHashMap getProperties();
public void setClassProps(String classProps);
- public String getClassProps();
+ public String getClassProps();
}
diff --git a/source/com/c2kernel/collection/CollectionMemberList.java b/source/com/c2kernel/collection/CollectionMemberList.java index 3f9345e..0a4bb25 100644 --- a/source/com/c2kernel/collection/CollectionMemberList.java +++ b/source/com/c2kernel/collection/CollectionMemberList.java @@ -11,12 +11,12 @@ package com.c2kernel.collection; import com.c2kernel.utils.CastorArrayList;
-public class CollectionMemberList extends CastorArrayList<CollectionMember>
+public class CollectionMemberList<E extends CollectionMember> extends CastorArrayList<E>
{
public CollectionMemberList()
- {
+ {
super();
}
-
+
}
diff --git a/source/com/c2kernel/collection/Dependency.java b/source/com/c2kernel/collection/Dependency.java index 1b74d42..9351731 100755..100644 --- a/source/com/c2kernel/collection/Dependency.java +++ b/source/com/c2kernel/collection/Dependency.java @@ -1,8 +1,9 @@ package com.c2kernel.collection;
-import java.util.Iterator;
-import com.c2kernel.utils.*;
+import com.c2kernel.utils.CastorHashMap;
+import com.c2kernel.utils.KeyValuePair;
+import com.c2kernel.utils.Logger;
/*
Dependency Object
@@ -14,32 +15,30 @@ e.g.: Used for ProductDesc::Item-dependency-dependencymember-WfDesc::Item * @version $Revision: 1.15 $ $Date: 2005/04/07 08:03:21 $
* @author $Author: abranson $
*/
-public class Dependency extends Parent2ChildCollection
+public class Dependency extends Parent2ChildCollection<DependencyMember>
{
protected CastorHashMap mProperties = new CastorHashMap();
protected String mClassProps = "";
-
+
public Dependency()
{
setName("Dependency");
- mMembers = new CollectionMemberList();
}
public Dependency(String name)
{
setName(name);
- mMembers = new CollectionMemberList();
}
-
+
public CastorHashMap getProperties() {
return mProperties;
}
-
+
public void setProperties(CastorHashMap props) {
mProperties = props;
}
-
+
public KeyValuePair[] getKeyValuePairs()
{
return mProperties.getKeyValuePairs();
@@ -48,67 +47,69 @@ public class Dependency extends Parent2ChildCollection {
mProperties.setKeyValuePairs(pairs);
}
-
+
public void setClassProps(String classProps) {
this.mClassProps = classProps;
}
-
+
public String getClassProps() {
return mClassProps;
}
- public void addMember(int entityKey) throws MembershipException {
+ @Override
+ public void addMember(int entityKey) throws MembershipException {
// create member object
DependencyMember depMember = new DependencyMember();
depMember.setID(getCounter());
depMember.setProperties(mProperties);
depMember.setClassProps(mClassProps);
-
+
// assign entity
depMember.assignEntity(entityKey);
mMembers.list.add(depMember);
- Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");
+ Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");
}
- public void addMember(int entityKey, CastorHashMap props, String classProps)
+ @Override
+ public void addMember(int entityKey, CastorHashMap props, String classProps)
throws MembershipException
{
if (classProps != null && !classProps.equals(mClassProps))
throw new MembershipException("Cannot change classProps in dependency member");
DependencyMember depMember = new DependencyMember();
depMember.setID(getCounter());
-
+
// merge props
CastorHashMap newProps = new CastorHashMap();
- for (Iterator iter = props.keySet().iterator(); iter.hasNext();) {
- String key = (String)iter.next();
- newProps.put(key, props.get(key));
-
+ for (Object name : props.keySet()) {
+ String key = (String)name;
+ newProps.put(key, props.get(key));
+
}
// class props override local
- for (Iterator iter = mProperties.keySet().iterator(); iter.hasNext();) {
- String key = (String)iter.next();
- newProps.put(key, mProperties.get(key));
-
+ for (Object name : mProperties.keySet()) {
+ String key = (String)name;
+ newProps.put(key, mProperties.get(key));
+
}
depMember.setProperties(newProps);
depMember.setClassProps(mClassProps);
-
+
// assign entity
depMember.assignEntity(entityKey);
mMembers.list.add(depMember);
- Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");
+ Logger.msg(8, "Dependency::addMember(" + entityKey + ") added to children.");
}
-
- public void removeMember(int memberId) throws MembershipException {
- for (Iterator iter = mMembers.list.iterator(); iter.hasNext();) {
- DependencyMember element = (DependencyMember)iter.next();
+
+ @Override
+ public void removeMember(int memberId) throws MembershipException {
+ for (DependencyMember element : mMembers.list) {
if (element.getID() == memberId) {
mMembers.list.remove(element);
return;
}
}
- throw new MembershipException("Member "+memberId+" not found");
+ throw new MembershipException("Member "+memberId+" not found");
}
}
diff --git a/source/com/c2kernel/collection/DependencyMember.java b/source/com/c2kernel/collection/DependencyMember.java index bb28c91..4ca2090 100755..100644 --- a/source/com/c2kernel/collection/DependencyMember.java +++ b/source/com/c2kernel/collection/DependencyMember.java @@ -24,7 +24,7 @@ public class DependencyMember implements CollectionMember {
private int mEntityKey = -1;
- private EntityProxy mEntity = null;
+ private EntityProxy mEntity = null;
private int mId = -1;
private CastorHashMap mProperties = null;
private String mClassProps;
@@ -40,27 +40,31 @@ public class DependencyMember implements CollectionMember }
- public void setEntityKey(int entityKey)
+ @Override
+ public void setEntityKey(int entityKey)
{
mEntityKey = entityKey;
- mEntity = null;
+ mEntity = null;
}
- public int getEntityKey()
+ @Override
+ public int getEntityKey()
{
return mEntityKey;
}
+ @Override
public void setProperties(CastorHashMap props)
{
mProperties = props;
}
+ @Override
public CastorHashMap getProperties()
{
return mProperties;
}
-
+
public KeyValuePair[] getKeyValuePairs()
{
return mProperties.getKeyValuePairs();
@@ -70,61 +74,68 @@ public class DependencyMember implements CollectionMember mProperties.setKeyValuePairs(pairs);
}
+ @Override
public int getID() {
return mId;
}
+ @Override
public void setID(int id) {
mId = id;
}
- public void setClassProps(String props)
+ @Override
+ public void setClassProps(String props)
{
mClassProps = props;
}
- public String getClassProps()
+ @Override
+ public String getClassProps()
{
return mClassProps;
}
- public void assignEntity(int entityKey) throws MembershipException
+ @Override
+ public void assignEntity(int entityKey) throws MembershipException
{
if (entityKey > -1) {
if (mClassProps == null || getProperties() == null)
throw new MembershipException("ClassProps not yet set. Cannot check membership validity.");
-
+
//for each mandatory prop check if its in the member property and has the matching value
StringTokenizer sub = new StringTokenizer(mClassProps, ",");
while (sub.hasMoreTokens())
{
- String aClassProp = sub.nextToken();
- try {
- String memberValue = (String)getProperties().get(aClassProp);
- Property entityProperty = (Property)Gateway.getStorage().get(entityKey, ClusterStorage.PROPERTY+"/"+aClassProp, null);
+ String aClassProp = sub.nextToken();
+ try {
+ String memberValue = (String)getProperties().get(aClassProp);
+ Property entityProperty = (Property)Gateway.getStorage().get(entityKey, ClusterStorage.PROPERTY+"/"+aClassProp, null);
if (entityProperty == null)
throw new MembershipException("Property "+aClassProp+ " does not exist for entityKey=" + entityKey );
if (!entityProperty.getValue().equalsIgnoreCase(memberValue))
throw new MembershipException("DependencyMember::checkProperty() Values of mandatory prop "+aClassProp+" do not match " + entityProperty.getValue()+"!="+memberValue);
}
- catch (Exception ex)
+ catch (Exception ex)
{
Logger.error(ex);
throw new MembershipException("Error checking properties");
}
- }
+ }
}
-
+
mEntityKey = entityKey;
mEntity = null;
}
-
- public void clearEntity() {
+
+ @Override
+ public void clearEntity() {
mEntityKey = -1;
mEntity = null;
}
-
- public EntityProxy resolveEntity() throws ObjectNotFoundException {
+
+ @Override
+ public EntityProxy resolveEntity() throws ObjectNotFoundException {
if (mEntity == null) {
try {
EntityPath path = new EntityPath(mEntityKey);
@@ -134,7 +145,7 @@ public class DependencyMember implements CollectionMember }
}
return mEntity;
-
+
}
diff --git a/source/com/c2kernel/collection/Parent2ChildCollection.java b/source/com/c2kernel/collection/Parent2ChildCollection.java index 0160444..09e9f07 100755..100644 --- a/source/com/c2kernel/collection/Parent2ChildCollection.java +++ b/source/com/c2kernel/collection/Parent2ChildCollection.java @@ -1,5 +1,4 @@ package com.c2kernel.collection;
-import java.util.Iterator;
import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.persistency.ClusterStorage;
@@ -9,33 +8,36 @@ import com.c2kernel.utils.CastorHashMap; * @version $Revision: 1.23 $ $Date: 2004/05/14 15:39:39 $
* @author $Author: abranson $
*/
-abstract public class Parent2ChildCollection implements Collection
+abstract public class Parent2ChildCollection<E extends CollectionMember> implements Collection<E>
{
private int mCounter = -1; // Contains next available Member ID
- protected CollectionMemberList mMembers = new CollectionMemberList();
+ protected CollectionMemberList<E> mMembers = new CollectionMemberList<E>();
protected int mID = -1;
protected String mName = ""; // Not checked for uniqueness
protected String mURLInfo = "";
-
- public int getCounter()
+
+ @Override
+ public int getCounter()
{
if (mCounter == -1)
- for (Iterator iter = mMembers.list.iterator(); iter.hasNext();) {
- CollectionMember element = (CollectionMember)iter.next();
+ for (Object name : mMembers.list) {
+ CollectionMember element = (CollectionMember)name;
if (mCounter < element.getID())
mCounter = element.getID();
}
return ++mCounter;
}
- public void setCounter(int count)
+ @Override
+ public void setCounter(int count)
{
mCounter = count;
}
- public int size()
+ @Override
+ public int size()
{
return mMembers.list.size();
}
@@ -50,7 +52,8 @@ abstract public class Parent2ChildCollection implements Collection return mID;
}
- public void setName(String name)
+ @Override
+ public void setName(String name)
{
mName = name;
}
@@ -60,12 +63,14 @@ abstract public class Parent2ChildCollection implements Collection mURLInfo = urlInfo;
}
- public String getName()
+ @Override
+ public String getName()
{
return mName;
}
-
- public String getClusterType()
+
+ @Override
+ public String getClusterType()
{
return ClusterStorage.COLLECTION;
}
@@ -75,45 +80,49 @@ abstract public class Parent2ChildCollection implements Collection return mURLInfo;
}
- public void setMembers(CollectionMemberList newMembers)
+ @Override
+ public void setMembers(CollectionMemberList<E> newMembers)
{
mMembers = newMembers;
}
-
+
public boolean contains(int entityKey) {
- for (Iterator iter = mMembers.list.iterator(); iter.hasNext();) {
- CollectionMember element = (CollectionMember)iter.next();
+ for (Object name : mMembers.list) {
+ CollectionMember element = (CollectionMember)name;
if (element.getEntityKey() == entityKey)
return true;
}
return false;
}
-
+
public boolean isFull()
{
for (int i=0; i<size(); i++)
{
- CollectionMember element = (CollectionMember) mMembers.list.get(i);
+ CollectionMember element = mMembers.list.get(i);
if (element.getEntityKey() == -1)
return false;
}
- return true;
+ return true;
}
-
- public CollectionMember getMember(int memberId) throws ObjectNotFoundException {
- for (Iterator iter = mMembers.list.iterator(); iter.hasNext();) {
- CollectionMember element = (CollectionMember)iter.next();
+
+ @Override
+ public CollectionMember getMember(int memberId) throws ObjectNotFoundException {
+ for (Object name : mMembers.list) {
+ CollectionMember element = (CollectionMember)name;
if (element.getID() == memberId)
return element;
}
throw new ObjectNotFoundException("Member "+memberId+" not found in "+mName, "");
}
- public CollectionMemberList getMembers()
+ @Override
+ public CollectionMemberList<E> getMembers()
{
return mMembers;
}
- public abstract void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException;
+ @Override
+ public abstract void addMember(int entityKey, CastorHashMap props, String classProps) throws MembershipException;
}
diff --git a/source/com/c2kernel/collection/RelationshipUtils.java b/source/com/c2kernel/collection/RelationshipUtils.java index fdd7e6b..6e35ac8 100755..100644 --- a/source/com/c2kernel/collection/RelationshipUtils.java +++ b/source/com/c2kernel/collection/RelationshipUtils.java @@ -19,14 +19,14 @@ public class RelationshipUtils if (entityKey == -1) return false;
try
{
- if ( ((Aggregation) Gateway.getProxyManager().getProxy(new EntityPath(entityKey)).getObject(ClusterStorage.COLLECTION+"/Composition" )).size() > 0 )
- return true;
+ if ( ((Aggregation) Gateway.getProxyManager().getProxy(new EntityPath(entityKey)).getObject(ClusterStorage.COLLECTION+"/Composition" )).size() > 0 )
+ return true;
}
- catch (Exception ex)
+ catch (Exception ex)
{
//do nothing - member has no composition, thus elementary
- }
-
+ }
+
return false;
}
diff --git a/source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java b/source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java index d99ef3c..cd4963f 100755..100644 --- a/source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java +++ b/source/com/c2kernel/collection/gui/model/AggregationVertexFactory.java @@ -17,14 +17,16 @@ public class AggregationVertexFactory implements VertexFactory private Aggregation mAggregation = null;
- public void setCreationContext(Object aggregation)
+ @Override
+ public void setCreationContext(Object aggregation)
{
if (aggregation != null && aggregation instanceof Aggregation)
mAggregation = (Aggregation)aggregation;
}
- public void create
+ @Override
+ public void create
(
GraphModelManager graphModelManager,
Point location,
diff --git a/source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java b/source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java index ed19f9c..b28af2e 100755..100644 --- a/source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java +++ b/source/com/c2kernel/collection/gui/model/AggregationVertexOutlineCreator.java @@ -7,7 +7,8 @@ import com.c2kernel.graph.model.VertexOutlineCreator; public class AggregationVertexOutlineCreator implements VertexOutlineCreator
{
- public void setOutline(Vertex vertex)
+ @Override
+ public void setOutline(Vertex vertex)
{
GraphPoint centre = vertex.getCentrePoint();
int height = vertex.getHeight();
diff --git a/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java b/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java index 0d3cb03..6d41d20 100755..100644 --- a/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java +++ b/source/com/c2kernel/collection/gui/view/AggregationMemberRenderer.java @@ -19,31 +19,32 @@ public class AggregationMemberRenderer implements VertexRenderer {
private Aggregation mAggregation = null;
-
+
public AggregationMemberRenderer()
{
}
-
+
public void setAggregation(Aggregation agg)
{
mAggregation = agg;
- }
-
-
- public void draw(Graphics2D g2d, Vertex vertex)
+ }
+
+
+ @Override
+ public void draw(Graphics2D g2d, Vertex vertex)
{
GraphPoint centre = vertex.getCentrePoint();
GraphPoint[] outline = vertex.getOutlinePoints();
FontMetrics metrics = g2d.getFontMetrics();
-
+
AggregationMember memberPair = mAggregation.getMemberPair(vertex.getID());
try
- {
- String name = memberPair.getEntityName();
+ {
+ String name = memberPair.getEntityName();
- g2d.drawString( name,
- centre.x-metrics.stringWidth(name)/2,
+ g2d.drawString( name,
+ centre.x-metrics.stringWidth(name)/2,
topYOfOutline(outline) );
g2d.drawImage
@@ -54,8 +55,8 @@ public class AggregationMemberRenderer implements VertexRenderer null
);
-
-
+
+
// Draw the outline of the vertex
if(outline.length > 1)
{
@@ -69,7 +70,7 @@ public class AggregationMemberRenderer implements VertexRenderer outline[i+1].y
);
}
-
+
g2d.drawLine
(
outline[outline.length-1].x,
@@ -84,7 +85,7 @@ public class AggregationMemberRenderer implements VertexRenderer catch (Exception ex)
{
Logger.error("AggregationMemberRenderer::draw() " + ex);
- }
+ }
}
@@ -104,7 +105,7 @@ public class AggregationMemberRenderer implements VertexRenderer return topY;
}
-
+
int bottomYOfOutline(GraphPoint[] outline)
{
int bottomY = outline[0].y;
diff --git a/source/com/c2kernel/collection/gui/view/PropertyPanel.java b/source/com/c2kernel/collection/gui/view/PropertyPanel.java index 903ddf9..f566d70 100755..100644 --- a/source/com/c2kernel/collection/gui/view/PropertyPanel.java +++ b/source/com/c2kernel/collection/gui/view/PropertyPanel.java @@ -1,7 +1,7 @@ package com.c2kernel.collection.gui.view;
+import com.c2kernel.collection.Aggregation;
import com.c2kernel.collection.AggregationMember;
-import com.c2kernel.collection.Collection;
import com.c2kernel.collection.CollectionMember;
import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.graph.model.Vertex;
@@ -9,17 +9,18 @@ import com.c2kernel.graph.view.VertexPropertyPanel; public class PropertyPanel extends VertexPropertyPanel {
- Collection mCollection;
-
+ Aggregation mCollection;
+
public PropertyPanel() {
super();
}
-
- public void setCollection(Collection collection) {
+
+ public void setCollection(Aggregation collection) {
mCollection = collection;
}
- public void setVertex(Vertex vert) {
+ @Override
+ public void setVertex(Vertex vert) {
try {
CollectionMember newMember = mCollection.getMember(vert.getID());
if (newMember instanceof AggregationMember) {
diff --git a/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java b/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java index 5e66c1e..5b59b35 100755..100644 --- a/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java +++ b/source/com/c2kernel/collection/gui/view/SelectedMemberPanel.java @@ -4,7 +4,14 @@ import java.awt.GridLayout; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.JToggleButton;
import com.c2kernel.collection.AggregationMember;
import com.c2kernel.collection.MembershipException;
@@ -39,22 +46,23 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe SelectedMemberPanel me;
AggregationMember selectedMember = null;
-
+
public SelectedMemberPanel() {
me=this;
setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
-
+
JPanel attrs = new JPanel(new GridLayout(3,2));
attrs.add(new JLabel(Language.translate("Slot Number:")));
attrs.add(slotNumber);
attrs.add(new JLabel(Language.translate("Assigned Member:")));
attrs.add(memberKey);
memberKey.setEditable(false);
-
+
add(attrs);
add(Box.createVerticalStrut(10));
findButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent ae) {
String code = memberKey.getText();
if (code == null || code.length() == 0)
@@ -62,9 +70,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe MainFrame.itemFinder.pushNewKey(code);
}
});
-
+
changeButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent ae) {
+ @Override
+ public void actionPerformed(ActionEvent ae) {
if (changeButton.getModel().isSelected()) {
MainFrame.status.setText(Language.translate("Please scan or type your barcode to assign in the top field"));
MainFrame.itemFinder.setConsumer(me, "Assign");
@@ -77,9 +86,10 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe }
}
});
-
+
removeButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent ae) {
+ @Override
+ public void actionPerformed(ActionEvent ae) {
selectedMember.clearEntity();
selectedMember.getProperties().remove("Name");
select(selectedMember);
@@ -92,11 +102,12 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe buttonBox.add(changeButton);
buttonBox.add(removeButton);
}
-
+
setButtons(false);
add(buttonBox);
}
+ @Override
public void select(Vertex vert) {
selectedMember = (AggregationMember)vert;
slotNumber.setText(String.valueOf(vert.getID()));
@@ -108,10 +119,11 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe } catch (Exception e) { }
memberKey.setText(name);
setButtons(true);
-
+
revalidate();
}
-
+
+ @Override
public void clear() {
slotNumber.setText("");
memberKey.setText("");
@@ -123,13 +135,14 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe findButton.setEnabled(state);
changeButton.getModel().setSelected(false);
changeButton.setEnabled(state);
- removeButton.setEnabled(state);
- MainFrame.itemFinder.clearConsumer(me);
+ removeButton.setEnabled(state);
+ MainFrame.itemFinder.clearConsumer(me);
}
/**
*
*/
- public void push(DomainPath key) {
+ @Override
+ public void push(DomainPath key) {
MainFrame.status.setText("Assigning entity "+key.getSysKey()+" to slot "+selectedMember.getID());
try {
selectedMember.assignEntity(key.getSysKey());
@@ -142,7 +155,8 @@ public class SelectedMemberPanel extends SelectedVertexPanel implements DomainKe /**
*
*/
- public void push(String name) {
+ @Override
+ public void push(String name) {
JOptionPane.showMessageDialog(null, "Product is not known in this centre", "Error", JOptionPane.ERROR_MESSAGE);
}
|