Revision: 1192
http://cishell.svn.sourceforge.net/cishell/?rev=1192&view=rev
Author: pataphil
Date: 2011-01-19 18:42:55 +0000 (Wed, 19 Jan 2011)
Log Message:
-----------
* Parameter dialogs should now display parameters in the order they were added.
Modified Paths:
--------------
trunk/core/org.cishell.reference/src/org/cishell/reference/service/metatype/BasicObjectClassDefinition.java
Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/metatype/BasicObjectClassDefinition.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/metatype/BasicObjectClassDefinition.java 2011-01-11 17:26:18 UTC (rev 1191)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/metatype/BasicObjectClassDefinition.java 2011-01-19 18:42:55 UTC (rev 1192)
@@ -10,8 +10,9 @@
public class BasicObjectClassDefinition implements ObjectClassDefinition {
- List attributeDefinitionsOptional = new ArrayList();
- List attributeDefinitionsRequired = new ArrayList();
+ List<AttributeDefinition> optionalAttributeDefinitions = new ArrayList<AttributeDefinition>();
+ List<AttributeDefinition> requiredAttributeDefinitions = new ArrayList<AttributeDefinition>();
+ List<AttributeDefinition> allAttributeDefinitions = new ArrayList<AttributeDefinition>();
private String ID;
private String name;
private String description;
@@ -25,38 +26,31 @@
}
public void addAttributeDefinition(int flag, AttributeDefinition definition) {
- if(flag == REQUIRED) {
- this.attributeDefinitionsRequired.add(definition);
- } else if(flag == OPTIONAL) {
- this.attributeDefinitionsOptional.add(definition);
+ if (flag == REQUIRED) {
+ this.requiredAttributeDefinitions.add(definition);
+ } else if (flag == OPTIONAL) {
+ this.optionalAttributeDefinitions.add(definition);
}
+
+ this.allAttributeDefinitions.add(definition);
}
-
-
+
public AttributeDefinition[] getAttributeDefinitions(int flag) {
+ List<AttributeDefinition> results = new ArrayList<AttributeDefinition>();
- List results = new ArrayList();
-
- if(flag == REQUIRED || flag == ALL) {
- results.addAll(this.attributeDefinitionsRequired);
+ if (flag == REQUIRED) {
+ results.addAll(this.requiredAttributeDefinitions);
+ } else if (flag == OPTIONAL) {
+ results.addAll(this.optionalAttributeDefinitions);
+ } else {
+ results.addAll(this.allAttributeDefinitions);
}
- if(flag == OPTIONAL || flag == ALL) {
- results.addAll(this.attributeDefinitionsOptional);
-
- }
-
return makeArray(results);
}
- private AttributeDefinition[] makeArray(List definitions) {
- AttributeDefinition[] result = new AttributeDefinition[definitions.size()];
-
- for(int ii = 0; ii < definitions.size(); ii++) {
- result[ii] = (AttributeDefinition) definitions.get(ii);
- }
-
- return result;
+ private AttributeDefinition[] makeArray(List<AttributeDefinition> definitions) {
+ return definitions.toArray(new AttributeDefinition[0]);
}
public String getDescription() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
