Changeset 1015 for trunk/src

Timestamp:

10/25/11 09:03:42 (13 years ago)

Author:

lgiessmann

Message:

gdl-frontend: Widgets: implemented the tmcl:subject-identifier-constraint and tmcl:subject-locator-constraint semantics for generating content entered in GdlVisibleObject?

Location:

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets

Files:

• base/GdlPanel.java (modified) (4 diffs)
• base/GdlVisibleObject.java (modified) (7 diffs)
• base/TestClass.java (modified) (2 diffs)
• base/TmHelper.java (modified) (3 diffs)
• environment/ICommitCallback.java (modified) (2 diffs)
• environment/IDeleteCallback.java (modified) (1 diff)
• isidorus/CommitCallback.java (modified) (5 diffs)
• isidorus/DeleteCallback.java (modified) (3 diffs)
• view/GdlAssociationView.java (modified) (4 diffs)
• view/GdlTopicView.java (modified) (9 diffs)

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java ¶

@@ -3 +3 @@
 import java.util.ArrayList;
 import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine;
-import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes;
@@ -211 +210 @@
                                 throw new ExecutionException("No CommitCallback was set yet");
                         }
-                        ArrayList<Pair<Construct, TopicMapsTypes>> data = new ArrayList<Pair<Construct,TopicMapsTypes>>();
-                        data.add(new Pair<Construct, TopicMapsTypes>(this.requestedSchemaTm, TopicMapsTypes.TopicMap));
+                        ArrayList<Pair<Object, TopicMapsTypes>> data = new ArrayList<Pair<Object,TopicMapsTypes>>();
+                        data.add(new Pair<Object, TopicMapsTypes>(this.requestedSchemaTm, TopicMapsTypes.TopicMap));
                         this.commitCallback.commitTmConstruct(data, null, this.tmEngine);
                 }catch(Exception e){
@@ -254 +253 @@
                                 throw new ExecutionException("No DeleteCallback was set yet");
         
-                        ArrayList<Pair<Construct, TopicMapsTypes>> data = new ArrayList<Pair<Construct,TopicMapsTypes>>();
-                        data.add(new Pair<Construct, TopicMapsTypes>(this.requestedSchemaTm, TopicMapsTypes.TopicMap));
+                        ArrayList<Pair<Object, TopicMapsTypes>> data = new ArrayList<Pair<Object,TopicMapsTypes>>();
+                        data.add(new Pair<Object, TopicMapsTypes>(this.requestedSchemaTm, TopicMapsTypes.TopicMap));
                         this.deleteCallback.deleteTmConstruct(data, this.getTmEngine(), null);
                 }catch(Exception e){
@@ -266 +265 @@
         // this method is responsible for generating a Topic Map fo the user's
         // data by using the view's getContent method.
-        public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(boolean validate) throws Exception {
+        public ArrayList<Pair<Object, TopicMapsTypes>> getContent(boolean validate) throws Exception {
                 try{
                         return this.view.getContent(null, validate);

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ¶

@@ -5 +5 @@
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Locator;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence;
@@ -2334 +2335 @@
 
 
-        // validates names, occurrences and identifiers for tha passed value
+        // validates names, occurrences and identifiers for the passed value
         private void validateLiteralValue(String selectedValue) throws InvalidContentException, InvalidGdlSchemaException{
-                ArrayList<Pattern> validLiteralValues = new ArrayList<Pattern>();
-                for (String literal : this.getLiterals()) validLiteralValues.add(new Pattern(literal));
-                if(validLiteralValues.size() == 0) validLiteralValues.add(new Pattern(this.getLiteralValueForConstraint()));    
-                int i = 0;
-                for( ; i != validLiteralValues.size(); ++i) if(validLiteralValues.get(i).matches(selectedValue)) break;
-
-                if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicNameConstraint)){
-                        if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + selectedValue + " for the topic-name " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues));
-                } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicOccurrenceConstraint)){
-                        if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + selectedValue + " for the topic-occurrence " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues));
-                } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclSubjectIdentifierConstraint)){
-
-                } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclSubjectLocatorConstraint)){
-
-                } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){
-
+                if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclSubjectIdentifierConstraint) || TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclSubjectLocatorConstraint) || TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){
+                        Pattern pattern = new Pattern(TmHelper.getRegExp(this.getConstraint()));
+                        if(!pattern.matches(selectedValue)) throw new InvalidContentException("The value \"" + selectedValue + "\" does not satisfy the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " with the regular expression: " + TmHelper.getRegExp(this.getConstraint()));
+                } else {
+                        ArrayList<Pattern> validLiteralValues = new ArrayList<Pattern>();
+                        for (String literal : this.getLiterals()) validLiteralValues.add(new Pattern(literal));
+                        if(validLiteralValues.size() == 0) validLiteralValues.add(new Pattern(this.getLiteralValueForConstraint()));    
+                        int i = 0;
+                        for( ; i != validLiteralValues.size(); ++i) if(validLiteralValues.get(i).matches(selectedValue)) break;
+
+                        if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicNameConstraint)){
+                                if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + selectedValue + " for the topic-name " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues));
+                        } else if(TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicOccurrenceConstraint)){
+                                if(i == validLiteralValues.size()) throw new InvalidContentException("the user data " + selectedValue + " for the topic-occurrence " + TmHelper.getAnyIdOfTopic(TmHelper.getConstrainedStatement(this.getConstraint())) + " does not satisfy any of the constraints: " + Utils.arrayToString(validLiteralValues));
+                        }
                 }
         }
@@ -2381 +2381 @@
         }
 
+        
+        // returns all locators contained in the passed locators array, which match the
+        // passed regular expression value
+        private ArrayList<Locator> filterLocators(String pattern, JsArray<Locator> locators){
+                ArrayList<Locator> result = new ArrayList<Locator>();
+                if(locators == null || locators.length() == 0) return result;
+                Pattern patternObject = new Pattern(pattern == null ? ".*" : pattern);
+                
+                for(int i = 0; i != locators.length(); ++i){
+                        if(patternObject.matches(locators.get(i).getReference())) result.add(locators.get(i));
+                }
+                
+                return result;
+        }
+        
+        
+        // handles the getContetn call for subject identifiers and subject locators
+        private void getTopicIdentifierContent(ArrayList<Pair<Object, TopicMapsTypes>> contents, boolean validate, Topic carier, int selectedValueIndex) throws InvalidGdlSchemaException, InvalidContentException, ExecutionException{
+                JsArray<Locator> identifiers = null;
+                        
+                ArrayList<Locator> filteredIdentifiers = null;
+                boolean isPsiConstraint = false;
+                if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclSubjectIdentifierConstraint)){
+                        isPsiConstraint = true;
+                        identifiers = carier.getSubjectIdentifiers();
+                        filteredIdentifiers = this.filterLocators(TmHelper.getRegExp(this.getConstraint()), identifiers);
+                } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclSubjectLocatorConstraint)){
+                        identifiers = carier.getSubjectLocators();
+                        filteredIdentifiers = this.filterLocators(TmHelper.getRegExp(this.getConstraint()), identifiers);
+                } else {
+                        throw new ExecutionException("Only the constraints " + PSIs.TMCL.tmclSubjectIdentifierConstraint + " and " + PSIs.TMCL.tmclSubjectLocatorConstraint + " are supported by the function getTopicIdentifierContent");
+                }
+                
+                Locator changedIdentifier = null;
+                if(validate) this.validateLiteralValue(this.getSelectedValues().get(selectedValueIndex));
+                
+                if(filteredIdentifiers.size() > selectedValueIndex){
+                        changedIdentifier = filteredIdentifiers.get(selectedValueIndex);
+                        if(isPsiConstraint) carier.removeSubjectIdentifier(changedIdentifier);
+                        else carier.removeSubjectLocator(changedIdentifier);
+                }
+                
+                changedIdentifier = carier.getTopicMap().createLocator(this.getSelectedValues().get(selectedValueIndex));
+                if(isPsiConstraint) carier.addSubjectIdentifier(changedIdentifier);
+                else carier.addSubjectLocator(changedIdentifier);
+                contents.add(new Pair<Object, TopicMapsTypes>(changedIdentifier, TopicMapsTypes.Locator));
+        }
+        
 
         // returns the actual data that is hold by this instance
-        public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException {
-                ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>();
+        public ArrayList<Pair<Object, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException {
+                ArrayList<Pair<Object, TopicMapsTypes>> result = new ArrayList<Pair<Object,TopicMapsTypes>>();
                 if(this.getRootConstraint() == null) return result;
                 Construct localCarrier = carrier;
@@ -2393 +2441 @@
                                 // TODO: implement
                         } else if (TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclSubjectIdentifierConstraint)){
-                                // TODO: implement
+                                if(!(localCarrier instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to a Topic, but is: " + localCarrier.getClass());
+                                this.getTopicIdentifierContent(result, validate, (Topic)localCarrier, idx);
                         } else if (TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclSubjectLocatorConstraint)){
-                                // TODO: implement
-                        } else if (TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclTopicNameConstraint)){                             
+                                if(!(localCarrier instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to a Topic, but is: " + localCarrier.getClass());
+                                this.getTopicIdentifierContent(result, validate, (Topic)localCarrier, idx);
+                        } else if (TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclTopicNameConstraint)){
                                 if(!(localCarrier instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to a Topic, but is: " + localCarrier.getClass());
                                 Topic nameType = TmHelper.getConstrainedStatement(this.getConstraint());
@@ -2410 +2460 @@
                                         changedName = ((Topic)localCarrier).createName(this.getSelectedValues().get(idx), nameType, null);
                                 }
-
-                                result.add(new Pair<Construct, TopicMapsTypes>(changedName, TopicMapsTypes.Name));
+                                result.add(new Pair<Object, TopicMapsTypes>(changedName, TopicMapsTypes.Name));
                         } else if (TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclVariantNameConstraint)){
                                 // TODO: implement                      
@@ -2443 +2492 @@
                                 }
 
-                                result.add(new Pair<Construct, TopicMapsTypes>(changedOccurrence, TopicMapsTypes.Occurrence));
+                                result.add(new Pair<Object, TopicMapsTypes>(changedOccurrence, TopicMapsTypes.Occurrence));
                         } else if (TmHelper.isInstanceOf(this.getConstraint(), PSIs.GDL.TopicType.gdlRolePlayer)){
                                 if(!(localCarrier instanceof Association)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " must be bound to an Association, but is: " + localCarrier.getClass());
@@ -2466 +2515 @@
                                         changedRole = ((Association)localCarrier).createRole(roleType, player);
                                 }
-                                result.add(new Pair<Construct, TopicMapsTypes>(changedRole, TopicMapsTypes.Role));
+                                result.add(new Pair<Object, TopicMapsTypes>(changedRole, TopicMapsTypes.Role));
                         } else {
                                 throw new InvalidGdlSchemaException("the constraint " + TmHelper.getAnyIdOfTopic(this.getConstraint()) + " is not supported");

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ¶

@@ -3 +3 @@
 import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine;
 import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine;
-import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Locator;
 import us.isidor.gdl.anaToMia.Widgets.environment.ICommitCallback;
 import us.isidor.gdl.anaToMia.Widgets.environment.IDeleteCallback;
@@ -57 +57 @@
                         gdlPanel.setCommitCallback(new ICommitCallback() {
                                 @Override
-                                public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) {
-                                        Window.alert("not implemented yet :-(");
+                                public void commitTmConstruct(ArrayList<Pair<Object, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) {
+                                        for (Pair<Object, TopicMapsTypes> construct : constructs) {
+                                                if(construct.getSecond().equals(TopicMapsTypes.Topic)){
+                                                        Window.alert("Topic!!!");
+                                                } else if(construct.getSecond().equals(TopicMapsTypes.Locator)){
+                                                        Window.alert(((Locator)construct.getFirst()).getReference() + " >> " + construct.getSecond());
+                                                } else {
+                                                        Window.alert(construct.getFirst() + " >> " + construct.getSecond());
+                                                }
+                                        }
                                 }
                         });
                         gdlPanel.setDeleteCallback(new IDeleteCallback() {
                                 @Override
-                                public void deleteTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) {
+                                public void deleteTmConstruct(ArrayList<Pair<Object, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) {
                                         Window.alert("not implemented yet :-(");
                                 }

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ¶

@@ -1211 +1211 @@
                 ArrayList<Topic> nameOrOccurrenceTypes = Utils.union(nameTypes, occurrenceTypes);
                 
-                if(nameOrOccurrenceTypes.size() == 0){
+                 if(nameOrOccurrenceTypes.size() == 0){
                         return result;
                 } else if(nameOrOccurrenceTypes.size() > 1){
@@ -1369 +1369 @@
 
         
-        // returns an integer representing the tmcl:card-min value
+        // returns an integer representing the tmcl:card-min value of the passed constraint
         public static int getCardMin(Topic constraint) throws InvalidGdlSchemaException {
                 if(constraint == null) return 0;
@@ -1385 +1385 @@
         
         
-        // returns an integer representing the tmcl:card-max value or -1
-        // if infinite
+        // returns a string representing the tmcl:regexp value of the passed constraint
+        public static String getRegExp(Topic constraint) throws InvalidGdlSchemaException {
+                if(constraint == null) return ".*";
+                Occurrence occ = getSingleOccurrence(constraint, getTopicByPsi(PSIs.TMCL.tmclRegexp, constraint.getTopicMap()));
+                if(occ == null){
+                        return ".*";
+                } else {
+                        return occ.getValue();
+                }
+        }
+        
+        
+        // returns an integer representing the tmcl:card-max value of the
+        // passed constraint or -1 if infinite
         public static int getCardMax(Topic constraint) throws InvalidGdlSchemaException {
                 if(constraint == null) return 0;

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ICommitCallback.java ¶

@@ -4 +4 @@
 
 import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine;
-import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes;
 
@@ -10 +9 @@
 
 public interface ICommitCallback {
-        public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine);
+        public void commitTmConstruct(ArrayList<Pair<Object, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine);
 }

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/IDeleteCallback.java ¶

@@ -3 +3 @@
 import java.util.ArrayList;
 import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine;
-import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes;
 
 
 public interface IDeleteCallback {
-        public void deleteTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId);
+        public void deleteTmConstruct(ArrayList<Pair<Object, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId);
 }

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/CommitCallback.java ¶

@@ -23 +23 @@
 import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association;
-import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Locator;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name;
@@ -50 +49 @@
         
         @Override
-        public void commitTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) {
+        public void commitTmConstruct(ArrayList<Pair<Object, TopicMapsTypes>> constructs, String buttonId, TmEngine tmEngine) {
                 try{
                         if("creator_hash_object_commit_button_id".equals(buttonId)){
@@ -79 +78 @@
         
         
-        private void commitCreatedEnvironment(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine) throws ExporterException {
+        private void commitCreatedEnvironment(ArrayList<Pair<Object, TopicMapsTypes>> constructs, TmEngine tmEngine) throws ExporterException {
                 final String carrierPsi = PSIs.GDL.gdl + "environment_default_creator_topic_view_id";
                 ArrayList<Topic> topics = new ArrayList<Topic>();
                 ArrayList<TopicMap> topicMaps = new ArrayList<TopicMap>();
                 
-                for (Pair<Construct, TopicMapsTypes> construct : constructs) {
+                for (Pair<Object, TopicMapsTypes> construct : constructs) {
                         if(construct.getSecond().equals(TopicMapsTypes.Topic)) topics.add((Topic)construct.getFirst());
                         else if(construct.getSecond().equals(TopicMapsTypes.TopicMap)) topicMaps.add((TopicMap)construct.getFirst());
@@ -135 +134 @@
         
         
-        private void commitCreatedHashObject(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, boolean edited) throws ExporterException{
+        private void commitCreatedHashObject(ArrayList<Pair<Object, TopicMapsTypes>> constructs, TmEngine tmEngine, boolean edited) throws ExporterException{
                 final String carrierPsi = PSIs.GDL.gdl + "hash_object_default_creator_topic_view_id";
                 ArrayList<Topic> topics = new ArrayList<Topic>();
@@ -141 +140 @@
                 ArrayList<TopicMap> topicMaps = new ArrayList<TopicMap>();
                 
-                for (Pair<Construct, TopicMapsTypes> construct : constructs) {
+                for (Pair<Object, TopicMapsTypes> construct : constructs) {
                         if(construct.getSecond().equals(TopicMapsTypes.Association)) associations.add((Association)construct.getFirst());
                         else if(construct.getSecond().equals(TopicMapsTypes.Topic)) topics.add((Topic)construct.getFirst());

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/DeleteCallback.java ¶

@@ -19 +19 @@
 import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.ExporterException;
 import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine;
-import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes;
@@ -53 +52 @@
 
         @Override
-        public void deleteTmConstruct(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) {
+        public void deleteTmConstruct(ArrayList<Pair<Object, TopicMapsTypes>> constructs, TmEngine tmEngine, String buttonId) {
                 if(buttonId != null){
                         Element elem = DOM.getElementById(buttonId);
@@ -63 +62 @@
 
         
-        private void deleteTopic(ArrayList<Pair<Construct, TopicMapsTypes>> constructs, TmEngine tmEngine){
-                for (Pair<Construct, TopicMapsTypes> pair : constructs) {
+        private void deleteTopic(ArrayList<Pair<Object, TopicMapsTypes>> constructs, TmEngine tmEngine){
+                for (Pair<Object, TopicMapsTypes> pair : constructs) {
                         if(pair.getSecond().equals(TopicMapsTypes.Topic)){
                                 Topic top = (Topic)pair.getFirst();

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ¶

@@ -186 +186 @@
         
         @Override
-        public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException{
-                ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>();
+        public ArrayList<Pair<Object, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException{
+                ArrayList<Pair<Object, TopicMapsTypes>> result = new ArrayList<Pair<Object,TopicMapsTypes>>();
                 
                 for (Widget ctrl : this.subElements) {
                         if(ctrl instanceof ButtonableObject){
                                 if(((ButtonableObject)ctrl).getMainObject() instanceof AssociationItem){
-                                        for (Pair<Construct, TopicMapsTypes> pair : ((AssociationItem)((ButtonableObject)ctrl).getMainObject()).getContent(null, validate)) {
+                                        for (Pair<Object, TopicMapsTypes> pair : ((AssociationItem)((ButtonableObject)ctrl).getMainObject()).getContent(null, validate)) {
                                                 result.add(pair);
                                         }
@@ -208 +208 @@
                         if(TmHelper.isInstanceOf(hdv.getConstraint(), PSIs.GDL.TopicType.gdlRolePlayer)){
                                 if(!TmHelper.isInstanceOf(hdv.getRootConstraint(), PSIs.TMCL.tmclTopicRoleConstraint)) throw new InvalidGdlSchemaException("the constraint " + TmHelper.getAnyIdOfTopic(hdv.getConstraint()) + " must be bound to an instance of " + PSIs.TMCL.tmclTopicRoleConstraint + ", but is: " + TmHelper.getAnyIdOfTopic(hdv.getRootConstraint()));
-                                for (Pair<Construct, TopicMapsTypes> pair : result) {
+                                for (Pair<Object, TopicMapsTypes> pair : result) {
                                         if(pair.getSecond().equals(TopicMapsTypes.Association)){
                                                 Association assoc = (Association)pair.getFirst();
@@ -277 +277 @@
                 
                 @Override
-                public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException {
-                        ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>();
+                public ArrayList<Pair<Object, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException {
+                        ArrayList<Pair<Object, TopicMapsTypes>> result = new ArrayList<Pair<Object,TopicMapsTypes>>();
                         
                         Association localCarrier = this.getRepresentedAssociation();
@@ -287 +287 @@
                                 }
                         }
-                        result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Association));
+                        result.add(new Pair<Object, TopicMapsTypes>(localCarrier, TopicMapsTypes.Association));
                         return result;
                 }

trunk/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java ¶

@@ -89 +89 @@
         // returns true if the construct that is contained in the first member of pair
         // is also indirectly contained in the container
-        private boolean indirectlyContained(Pair<Construct, TopicMapsTypes> pair, ArrayList<Pair<Construct, TopicMapsTypes>> container){
+        private boolean indirectlyContained(Pair<Object, TopicMapsTypes> pair, ArrayList<Pair<Object, TopicMapsTypes>> container){
                 if(pair == null) return true;
                 if(container == null) return false;
@@ -96 +96 @@
                 if(newType.equals(TopicMapsTypes.Name)){
                         Name name = (Name)pair.getFirst();
-                        for (Pair<Construct, TopicMapsTypes> item : container) {
+                        for (Pair<Object, TopicMapsTypes> item : container) {
                                 if(item.getSecond().equals(TopicMapsTypes.Topic)){
                                         JsArray<Name> names = ((Topic)item.getFirst()).getNames();
@@ -104 +104 @@
                 } else if (newType.equals(TopicMapsTypes.Variant)){
                         Variant variant = (Variant)pair.getFirst();
-                        for (Pair<Construct, TopicMapsTypes> item : container) {
+                        for (Pair<Object, TopicMapsTypes> item : container) {
                                 if(item.getSecond().equals(TopicMapsTypes.Name)){
                                         JsArray<Variant> variants = ((Name)item.getFirst()).getVariants();
@@ -111 +111 @@
                         }
                         
-                        for (Pair<Construct, TopicMapsTypes> item : container) {
+                        for (Pair<Object, TopicMapsTypes> item : container) {
                                 if(item.getSecond().equals(TopicMapsTypes.Topic)){
                                         JsArray<Name> names = ((Topic)item.getFirst()).getNames();
@@ -122 +122 @@
                 } else if (newType.equals(TopicMapsTypes.Occurrence)){
                         Occurrence occurrence = (Occurrence)pair.getFirst();
-                        for (Pair<Construct, TopicMapsTypes> item : container) {
+                        for (Pair<Object, TopicMapsTypes> item : container) {
                                 if(item.getSecond().equals(TopicMapsTypes.Topic)){
                                         JsArray<Occurrence> occurrences = ((Topic)item.getFirst()).getOccurrences();
@@ -130 +130 @@
                 } else if (newType.equals(TopicMapsTypes.Role)){
                         Role role = (Role)pair.getFirst();
-                        for (Pair<Construct, TopicMapsTypes> item : container) {
+                        for (Pair<Object, TopicMapsTypes> item : container) {
                                 if(item.getSecond().equals(TopicMapsTypes.Association)){
                                         JsArray<Role> roles = ((Association)item.getFirst()).getRoles();
@@ -144 +144 @@
         @SuppressWarnings("unchecked")
         @Override
-        public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException {
-                ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>();
+        public ArrayList<Pair<Object, TopicMapsTypes>> getContent(Construct carrier, boolean validate) throws InvalidGdlSchemaException, ExecutionException, InvalidContentException {
+                ArrayList<Pair<Object, TopicMapsTypes>> result = new ArrayList<Pair<Object,TopicMapsTypes>>();
                 
                 Topic localCarrier = this.getRepresentedTopic();
@@ -152 +152 @@
                         int i = 0;
                         for( ; i != result.size(); ++i) if(result.get(i).getFirst().equals(localCarrier)) break;
-                        if(i == result.size()) result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Topic));
+                        if(i == result.size()) result.add(new Pair<Object, TopicMapsTypes>(localCarrier, TopicMapsTypes.Topic));
                         
                         if(ctrl instanceof GdlVisibleObject){
-                                for (Pair<Construct, TopicMapsTypes> pair : ((GdlVisibleObject)ctrl).getContent(localCarrier, validate)) {
+                                for (Pair<Object, TopicMapsTypes> pair : ((GdlVisibleObject)ctrl).getContent(localCarrier, validate)) {
                                         if((this.receivedData != null || (ctrl instanceof GdlView)) && !this.indirectlyContained(pair, result))result.add(pair);
                                 }
@@ -178 +178 @@
                                 if(i == occurrences.length()){
                                         Occurrence occ = top.createOccurrence(occurrenceType, value, (JsArray<Topic>)JsArray.createArray());
-                                        Pair<Construct, TopicMapsTypes> newItem = new Pair<Construct, TopicMapsTypes>(occ, TopicMapsTypes.Occurrence);
+                                        Pair<Object, TopicMapsTypes> newItem = new Pair<Object, TopicMapsTypes>(occ, TopicMapsTypes.Occurrence);
                                         if(!this.indirectlyContained(newItem, result)) result.add(newItem);
                                 }