diff options
Diffstat (limited to 'source/com/c2kernel/property')
| -rw-r--r--[-rwxr-xr-x] | source/com/c2kernel/property/Property.java | 7 | ||||
| -rw-r--r-- | source/com/c2kernel/property/PropertyArrayList.java | 10 | ||||
| -rw-r--r--[-rwxr-xr-x] | source/com/c2kernel/property/PropertyDescription.java | 12 | ||||
| -rw-r--r-- | source/com/c2kernel/property/PropertyDescriptionList.java | 21 | ||||
| -rw-r--r--[-rwxr-xr-x] | source/com/c2kernel/property/PropertyUtility.java | 51 |
5 files changed, 51 insertions, 50 deletions
diff --git a/source/com/c2kernel/property/Property.java b/source/com/c2kernel/property/Property.java index 2374c1b..3022cc5 100755..100644 --- a/source/com/c2kernel/property/Property.java +++ b/source/com/c2kernel/property/Property.java @@ -41,7 +41,8 @@ public class Property implements C2KLocalObject /**************************************************************************
*
**************************************************************************/
- public void setName(String name)
+ @Override
+ public void setName(String name)
{
mName = name;
}
@@ -50,7 +51,8 @@ public class Property implements C2KLocalObject /**************************************************************************
*
**************************************************************************/
- public String getName()
+ @Override
+ public String getName()
{
return mName;
}
@@ -75,6 +77,7 @@ public class Property implements C2KLocalObject /**
* @see com.c2kernel.entity.C2KLocalObject#getClusterType()
*/
+ @Override
public String getClusterType() {
return ClusterStorage.PROPERTY;
}
diff --git a/source/com/c2kernel/property/PropertyArrayList.java b/source/com/c2kernel/property/PropertyArrayList.java index dffbaf6..f59b2d5 100644 --- a/source/com/c2kernel/property/PropertyArrayList.java +++ b/source/com/c2kernel/property/PropertyArrayList.java @@ -13,17 +13,17 @@ import java.util.ArrayList; import com.c2kernel.utils.CastorArrayList;
-public class PropertyArrayList extends CastorArrayList<Property>
+public class PropertyArrayList extends CastorArrayList<Property>
{
public PropertyArrayList()
- {
+ {
super();
}
-
+
public PropertyArrayList(ArrayList<Property> aList)
- {
+ {
super(aList);
}
-
+
}
diff --git a/source/com/c2kernel/property/PropertyDescription.java b/source/com/c2kernel/property/PropertyDescription.java index dbbd6b9..cd3b93c 100755..100644 --- a/source/com/c2kernel/property/PropertyDescription.java +++ b/source/com/c2kernel/property/PropertyDescription.java @@ -9,10 +9,10 @@ package com.c2kernel.property;
-public class PropertyDescription
+public class PropertyDescription
{
private String mName=null;
- private String mDefaultValue=null;
+ private String mDefaultValue=null;
private boolean mIsClassIdentifier=false;
private boolean mIsMutable=false;
@@ -20,13 +20,13 @@ public class PropertyDescription public PropertyDescription()
{
}
-
+
public PropertyDescription(String name, String defaultValue, boolean isClassIdentifier, boolean isMutable )
{
setName(name);
setDefaultValue(defaultValue);
setIsClassIdentifier(isClassIdentifier);
- setIsMutable(isMutable);
+ setIsMutable(isMutable);
}
public void setName(String name)
@@ -44,7 +44,7 @@ public class PropertyDescription mDefaultValue = defaultValue;
}
- public void setIsMutable(boolean mutable)
+ public void setIsMutable(boolean mutable)
{
mIsMutable = mutable;
}
@@ -68,7 +68,7 @@ public class PropertyDescription {
return mIsMutable;
}
-
+
public Property getProperty()
{
return new Property(mName,mDefaultValue);
diff --git a/source/com/c2kernel/property/PropertyDescriptionList.java b/source/com/c2kernel/property/PropertyDescriptionList.java index 64754a7..4728569 100644 --- a/source/com/c2kernel/property/PropertyDescriptionList.java +++ b/source/com/c2kernel/property/PropertyDescriptionList.java @@ -10,26 +10,25 @@ package com.c2kernel.property;
import java.util.ArrayList;
-import java.util.Iterator;
import com.c2kernel.utils.CastorArrayList;
-public class PropertyDescriptionList extends CastorArrayList<PropertyDescription>
+public class PropertyDescriptionList extends CastorArrayList<PropertyDescription>
{
public PropertyDescriptionList()
- {
+ {
super();
}
-
+
public PropertyDescriptionList(ArrayList<PropertyDescription> aList)
- {
+ {
super(aList);
}
-
+
public String getClassProps() {
StringBuffer props = new StringBuffer();
- for (Iterator iter = list.iterator(); iter.hasNext();) {
- PropertyDescription element = (PropertyDescription)iter.next();
+ for (Object name : list) {
+ PropertyDescription element = (PropertyDescription)name;
if (element.getIsClassIdentifier()) {
if (props.length()>0)
props.append(",");
@@ -38,10 +37,10 @@ public class PropertyDescriptionList extends CastorArrayList<PropertyDescription }
return props.toString();
}
-
+
public boolean setDefaultValue(String name, String value) {
- for (Iterator iter = list.iterator(); iter.hasNext();) {
- PropertyDescription element = (PropertyDescription)iter.next();
+ for (Object name2 : list) {
+ PropertyDescription element = (PropertyDescription)name2;
if (element.getName().equals(name)) {
element.setDefaultValue(value);
return true;
diff --git a/source/com/c2kernel/property/PropertyUtility.java b/source/com/c2kernel/property/PropertyUtility.java index 9c65598..40d15bd 100755..100644 --- a/source/com/c2kernel/property/PropertyUtility.java +++ b/source/com/c2kernel/property/PropertyUtility.java @@ -21,66 +21,65 @@ import com.c2kernel.utils.Logger; public class PropertyUtility
{
- static public String getValue(ArrayList pdlist, String name)
+ static public String getValue(ArrayList<?> pdlist, String name)
{
Object[] values = pdlist.toArray();
- for (int i=0;i<values.length;i++)
- {
- PropertyDescription pd = (PropertyDescription) values[i];
- if ( name.equalsIgnoreCase(pd.getName()) )
- return pd.getDefaultValue();
- }
+ for (Object value : values) {
+ PropertyDescription pd = (PropertyDescription) value;
+ if ( name.equalsIgnoreCase(pd.getName()) )
+ return pd.getDefaultValue();
+ }
return null;
}
- static public String getNames(ArrayList pdlist)
+ static public String getNames(ArrayList<?> pdlist)
{
Object[] values = pdlist.toArray();
StringBuffer names = new StringBuffer();
- for (int i=0;i<values.length;i++)
- names.append( ((PropertyDescription)values[i]).getDefaultValue()).append(" ");
+ for (Object value : values)
+ names.append( ((PropertyDescription)value).getDefaultValue()).append(" ");
return names.toString();
}
- static public String getClassIdNames(ArrayList pdlist)
+ static public String getClassIdNames(ArrayList<?> pdlist)
{
Object[] values = pdlist.toArray();
StringBuffer names = new StringBuffer();
for (int i=0;i<values.length;i++)
{
- PropertyDescription pd = ((PropertyDescription)values[i]);
+ PropertyDescription pd = ((PropertyDescription)values[i]);
if (pd.getIsClassIdentifier())
names.append(pd.getName());
if (i<values.length-1 && i!=0)
- names.append(",");
- }
+ names.append(",");
+ }
return names.toString();
}
static public PropertyDescriptionList getPropertyDescriptionOutcome(int entityKey)
{
- try
- {
- Outcome outc = (Outcome) Gateway.getStorage().get(entityKey, ClusterStorage.VIEWPOINT+"/PropertyDescription/last/data", null);
+ try
+ {
+ Outcome outc = (Outcome) Gateway.getStorage().get(entityKey, ClusterStorage.VIEWPOINT+"/PropertyDescription/last/data", null);
return (PropertyDescriptionList)CastorXMLUtility.unmarshall(outc.getData());
- }
- catch (Exception ex)
- {
+ }
+ catch (Exception ex)
+ {
Logger.error(ex);
return null;
- }
+ }
}
- static public CastorHashMap createProperty(PropertyDescriptionList pdList)
+ static public CastorHashMap createProperty(PropertyDescriptionList pdList)
{
CastorHashMap props = new CastorHashMap();
for (int i=0; i< pdList.list.size();i++)
{
- PropertyDescription pd = (PropertyDescription) pdList.list.get(i);
- if (pd.getIsClassIdentifier())
- props.put(pd.getName(),pd.getDefaultValue());
- }
+ PropertyDescription pd = pdList.list.get(i);
+ if (pd.getIsClassIdentifier())
+ props.put(pd.getName(),pd.getDefaultValue());
+ }
return props;
}
|