August 2011 - isidorus-cvs@common-lisp.net

[isidorus-cvs] r803 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/base war/gdl_widgets
by lgiessmann＠common-lisp.net 30 Aug '11

30 Aug '11

Author: lgiessmann Date: Mon Aug 29 22:27:08 2011 New Revision: 803 Log: gdl-frontend: Widgets: finalised the GDL-Schema for the TextGrid-ServiceRegistry => Hidden-Value of has-environment associations Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlHiddenValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlHiddenValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlHiddenValue.java Mon Aug 29 08:29:07 2011 (r802) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlHiddenValue.java Mon Aug 29 22:27:08 2011 (r803) @@ -11,4 +11,8 @@ protected boolean defaultTmValueTopicSet = false; protected Topic defaultLiteralValueTopic = null; protected boolean defaultLiteralValueTopicSet = false; + + + + } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Mon Aug 29 08:29:07 2011 (r802) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Mon Aug 29 22:27:08 2011 (r803) @@ -59,6 +59,8 @@ {"subject_identifiers":["[gdlt:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]}, {"subject_identifiers":["[gdlt:Role-Player]"]}, {"subject_identifiers":["[gdlt:Visible-Object]"]}, + {"subject_identifiers":["[gdlt:Hidden-Value]"]}, + {"subject_identifiers":["[gdl:hidden-value]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:width]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:padding-left]"], "instance_of":["si:[tmcl:occurrence-type]"]}, {"subject_identifiers":["[gdl:height]"], "instance_of":["si:[tmcl:occurrence-type]"]}, @@ -104,6 +106,8 @@ {"subject_identifiers":["[tgg:has-environment-creator-association-view]"], "instance_of":["si:[gdlt:Creator-Association-View]"], "names":[{"type":"si:[gdl:view-name]", "value":"A Creator View for associations of the type http://textgrid.org/serviceregistry/model/has-environment"}], "occurrences":[{"type":"si:[gdl:id]", "value":"has_environment_createor_association_view_id"}, {"type":"si:[gdl:width]", "value":"230px"}]}, {"subject_identifiers":["[tgg:hash-object-has-environement-creator-association-view-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"120px"}]}, + {"subject_identifiers":["[tgg:has-environment-hash-role-hidden-value]"], "instance_of":["si:[gdlt:Hidden-Value]"]}]}, + {"subject_identifiers":["[tgg:hash-object-creator-text-label-env]"], "instance_of":["si:[gdlt:Text]"], "occurrences":[{"type":"si:[gdl:id]", "value":"hash_object_text_label_env_id"}, {"type":"si:[gdl:readonly]", "value":"true"}, {"type":"si:[gdl:width]", "value":"100px"},{"type":"si:[gdl:background-color]", "value":"gray"}, {"type":"si:[gdl:border-style]", "value":"none"}]}, {"subject_identifiers":["[tgg:hash-object-creator-text-label-env-position]"], "instance_of":["si:[gdlt:Position]"], "occurrences":[{"type":"si:[gdl:position-style]", "value":"absolute"}, {"type":"si:[gdl:top]", "value":"10px"}, {"type":"si:[gdl:left]", "value":"10px"}]}, {"subject_identifiers":["[tgg:hash-object-creator-text-label-env-value-group]"], "instance_of":["si:[gdlt:Value-Group]"]}, @@ -153,6 +157,7 @@ {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Association-View]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Association-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Creator-Association-View]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Descriptor]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Hidden-value]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:TM-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Value]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:TM-Single-Type-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:TM-Value]"}]}, {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdlt:Default-Literal-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdlt:Literal-Value]"}]}, @@ -182,6 +187,9 @@ {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-creator-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, {"type":"si:[gdl:association-view-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-default-creator-topic-view]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-association-role-constraint]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:hidden-value]", "player":"si:[tgg:has-environment-hash-role-hidden-value]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[tgm:has-environment-hash-role-constraint]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-environment-creator-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:has-environment-hash-role-hidden-value]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:has-environment-creator-association-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-creator-text-list-box-env]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-text-list-box-env-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:has-environment-creator-association-view]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-creator-text-list-box-env]"}]}, {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-creator-text-list-box-env-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-text-list-box-env]"}]},

1 0

[isidorus-cvs] r802 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base
by lgiessmann＠common-lisp.net 29 Aug '11

29 Aug '11

Author: lgiessmann Date: Mon Aug 29 08:29:07 2011 New Revision: 802 Log: gdl-frontend: Widgets: start to implement GdlHiddenValue Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlHiddenValue.java Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlHiddenValue.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlHiddenValue.java Mon Aug 29 08:29:07 2011 (r802) @@ -0,0 +1,14 @@ +package us.isidor.gdl.anaToMia.Widgets.base; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; + +public class GdlHiddenValue { + protected Topic constraintTopic = null; + protected boolean constraintTopicSet = false; + protected Topic rootConstraintTopic = null; + protected boolean rootConstraintTopicSet = false; + protected Topic defaultTmValueTopic = null; + protected boolean defaultTmValueTopicSet = false; + protected Topic defaultLiteralValueTopic = null; + protected boolean defaultLiteralValueTopicSet = false; +}

1 0

[isidorus-cvs] r801 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base button view
by lgiessmann＠common-lisp.net 29 Aug '11

29 Aug '11

Author: lgiessmann Date: Mon Aug 29 08:22:42 2011 New Revision: 801 Log: gdl-frontend: Widgets: implemented the infrastructure for GdlVisibleObject.getContent(Construct carrier) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Mon Aug 29 02:32:41 2011 (r800) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Mon Aug 29 08:22:42 2011 (r801) @@ -262,7 +262,7 @@ // data by using the view's getContent method. public ArrayList<Pair<Construct, TopicMapsTypes>> getContent() throws Exception { try{ - return this.view.getContent(); + return this.view.getContent(null); }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.TopicMapsGenerationError, e); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 29 02:32:41 2011 (r800) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 29 08:22:42 2011 (r801) @@ -2208,12 +2208,77 @@ // returns the strings of the control that are entered/selected + // returns the strings of the control that are entered/selected public abstract ArrayList<String> getSelectedValues(); // returns the actual data that is hold by this instance - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier) throws InvalidGdlSchemaException, ExecutionException { + ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); + if(carrier == null || this.getRootConstraint() == null) return result; + + //TODO: finalise + for (int idx = 0; idx != this.getSelectedValues().size(); ++idx){ + if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){ + + } 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.tmclTopicNameConstraint)){ + + } else if (TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclVariantNameConstraint)){ + + } else if (TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicOccurrenceConstraint)){ + if(!(carrier instanceof Topic)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getRootConstraint()) + " must be bound to a Topic, but is: " + carrier.getClass()); + Topic occurrenceType = TmHelper.getConstrainedStatement(this.getConstraint()); + JsArray<Occurrence> occurrences = ((Topic)carrier).getOccurrences(occurrenceType); + + Occurrence changedOccurrence = null; + if(this.getRootConstraint().equals(this.getConstraint())){ + if(occurrences.length() > idx){ + changedOccurrence = occurrences.get(idx); + changedOccurrence.setValue(this.getSelectedValues().get(idx)); + }else { + changedOccurrence = ((Topic)carrier).createOccurrence(occurrenceType, this.getSelectedValues().get(idx), null, null); + } + } // TODO: Type, Role-Player, ... + + result.add(new Pair<Construct, TopicMapsTypes>(changedOccurrence, TopicMapsTypes.Occurrence)); + } else if (TmHelper.isInstanceOf(this.getRootConstraint(), PSIs.TMCL.tmclTopicRoleConstraint)){ + if(!(carrier instanceof Association)) throw new ExecutionException("the constraint " + TmHelper.getAnyIdOfTopic(this.getRootConstraint()) + " must be bound to an Association, but is: " + carrier.getClass()); + Pair<Topic, Topic> roleAndPlayerType = TmHelper.getConstrainedRoleAndPlayerTypeOfConstraint(this.getRootConstraint()); + Topic roleType = roleAndPlayerType.getFirst(); + Topic playerType = roleAndPlayerType.getSecond(); + + JsArray<Role> typedRoles = ((Association)carrier).getRoles(roleType); + ArrayList<Role> roles = new ArrayList<Role>(); + for(int i = 0; i != typedRoles.length(); ++i) + if(TmHelper.isInstanceOf(typedRoles.get(i).getPlayer(), playerType)) roles.add(typedRoles.get(i)); + + Role changedRole = null; + if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclReifierConstraint)){ + // TODO: implement + } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.TMCL.tmclItemIdentifierConstraint)){ + // TODO: implement + } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.GDL.TopicType.gdlRolePlayer)){ + if(roles.size() > idx){ + changedRole = roles.get(idx); + changedRole.setPlayer(TmHelper.getTopicFromStringRepresentation(this.getSelectedValues().get(idx), this.getValueGroup())); + } else { + changedRole = ((Association)carrier).createRole(roleType, TmHelper.getTopicFromStringRepresentation(this.getSelectedValues().get(idx), this.getDisplayByOfValueGroup())); + } + } else if(TmHelper.isInstanceOf(this.getConstraint(), PSIs.GDL.TopicType.gdlType)){ + // TODO: implement + } else { + throw new InvalidGdlSchemaException("the root constraint must be bound to one of: " + PSIs.TMCL.tmclReifierConstraint + ", " + PSIs.TMCL.tmclItemIdentifierConstraint + ", " + PSIs.GDL.TopicType.gdlRolePlayer + ", " + PSIs.GDL.TopicType.gdlType + ", but is: " + TmHelper.getAnyIdOfTopic(this.getConstraint())); + } + result.add(new Pair<Construct, TopicMapsTypes>(changedRole, TopicMapsTypes.Role)); + } else { + throw new InvalidGdlSchemaException("the constraint " + TmHelper.getAnyIdOfTopic(this.getRootConstraint()) + " is not supported"); + } + } + + return result; } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 29 02:32:41 2011 (r800) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 29 08:22:42 2011 (r801) @@ -1282,4 +1282,26 @@ return result; } + + + // Returns the topic that is rperesentated by the passed string corresponding + // to the passed representationSchema + public static Topic getTopicFromStringRepresentation(String representation, Topic valueGroup) throws ExecutionException, InvalidGdlSchemaException { + if(representation == null || valueGroup == null) return null; + + ArrayList<Topic> tmValues = getTmValuesForConstraint(getConstraintOfValueGroup(valueGroup), valueGroup); + for (Topic tmValue : tmValues) { + if(getTopicRepresentation(tmValue, getDisplayByTopicOf(valueGroup), getPrefferedScopesForTopicOf(valueGroup)).equals(representation)) return tmValue; + } + + tmValues = getTmValues(valueGroup); + for (Topic tmValue : tmValues) { + ArrayList<Topic> rawValues = getValuesForTmValue(tmValue); + for (Topic rawValue : rawValues) { + if(getTopicRepresentation(tmValue, getDisplayByTopicOf(valueGroup), getPrefferedScopesForTopicOf(valueGroup)).equals(representation)) return rawValue; + } + } + + throw new ExecutionException("no topic found for the representation string: " + representation); + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Mon Aug 29 02:32:41 2011 (r800) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Mon Aug 29 08:22:42 2011 (r801) @@ -1,11 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.button; - import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Button; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; @@ -37,7 +35,12 @@ @Override public void onClick(ClickEvent event) { - Window.alert("content: " + this.owner.getContent()); + try{ + Window.alert("content: " + this.owner.getGdlParent().getContent(null)); + // TODO: implement + }catch(Exception e){ + Window.alert("caught: " + e.getMessage()); + } } } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Aug 29 02:32:41 2011 (r800) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Aug 29 08:22:42 2011 (r801) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; - import com.google.gwt.core.client.JsArray; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.VerticalPanel; @@ -10,6 +9,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; @@ -181,14 +181,25 @@ return this.validRoleCombinations; } } - + @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier) throws InvalidGdlSchemaException, ExecutionException { + ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,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)) { + result.add(pair); + } + } + } + } + + return result; } - + // This class represents a single association that is displayed. // Further elements are created by caling the GdlInstantiator.instantiate @@ -220,6 +231,27 @@ } + @SuppressWarnings("unchecked") + @Override + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier) throws InvalidGdlSchemaException, ExecutionException { + ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); + + Association localCarrier = (Association)this.receivedData; + if(localCarrier == null){ + TopicMap tm = this.tmRepresentative.getTopicMap(); + localCarrier = tm.createAssociation(((GdlAssociationView)this.getGdlParent()).getAssociationType(), (JsArray<Topic>)JsArray.createArray()); + } + + for (Widget ctrl : this.subElements) { + if(ctrl instanceof GdlVisibleObject){ + ((GdlVisibleObject)ctrl).getContent(localCarrier); + } + } + result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Association)); + return result; + } + + // this method should be invoked if a new sub-element is added to this instance. // instances of GdlView does not organize their sub-elements in // tables, sub-elements are placed directly on the mainpanel @@ -294,12 +326,5 @@ this.setBackgroundColor(widget, this.getBackgroundColor(styleClass), styleClass); } } - - - @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; - } } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Mon Aug 29 02:32:41 2011 (r800) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Mon Aug 29 08:22:42 2011 (r801) @@ -1,14 +1,11 @@ package us.isidor.gdl.anaToMia.Widgets.view; -import java.util.ArrayList; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; + public abstract class GdlDefaultTopicView extends GdlTopicView { @@ -18,10 +15,4 @@ } // TODO: implement - - @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Mon Aug 29 02:32:41 2011 (r800) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Mon Aug 29 08:22:42 2011 (r801) @@ -1,10 +1,11 @@ package us.isidor.gdl.anaToMia.Widgets.view; + import java.util.ArrayList; import com.google.gwt.user.client.ui.Widget; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; @@ -74,8 +75,24 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(Construct carrier) throws InvalidGdlSchemaException, ExecutionException { + ArrayList<Pair<Construct, TopicMapsTypes>> result = new ArrayList<Pair<Construct,TopicMapsTypes>>(); + + Topic localCarrier = (Topic)this.receivedData; + if(localCarrier == null){ + TopicMap tm = this.tmRepresentative.getTopicMap(); + localCarrier = tm.createTopicBySubjectIdentifier(tm.createLocator(this.getId())); + } + + for (Widget ctrl : this.subElements) { + if(this.receivedData == null) result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Topic)); + if(ctrl instanceof GdlVisibleObject){ + for (Pair<Construct, TopicMapsTypes> pair : ((GdlVisibleObject)ctrl).getContent(localCarrier)) { + if(this.receivedData != null)result.add(pair); + } + } + } + + return result; } }

1 0

[isidorus-cvs] r800 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base button complexData container text view
by lgiessmann＠common-lisp.net 29 Aug '11

29 Aug '11

Author: lgiessmann Date: Mon Aug 29 02:32:41 2011 New Revision: 800 Log: gdl-frontend: Widgets: implemented the infrastructure for getting created topic maps construct Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Mon Aug 29 02:32:41 2011 (r800) @@ -4,10 +4,8 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlSpace extends GdlVisibleObject { // some constructors @@ -31,8 +29,8 @@ @Override @Deprecated - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - return null; + public ArrayList<String> getSelectedValues(){ + return new ArrayList<String>(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 29 02:32:41 2011 (r800) @@ -2207,6 +2207,13 @@ } + // returns the strings of the control that are entered/selected + public abstract ArrayList<String> getSelectedValues(); + + // returns the actual data that is hold by this instance - public abstract ArrayList<Pair<Construct, TopicMapsTypes>> getContent(); + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ + // TODO: implement + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 29 02:32:41 2011 (r800) @@ -1,9 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.base; - -import java.util.ArrayList; - import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; @@ -30,14 +27,14 @@ mainPanel.setBorderWidth(1); mainPanel.setPixelSize(1000, 600); - ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); - requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); + //ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Environment", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/test-env", TopicIdentifierTypes.SubjectIdentifier); - //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); + Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() { @Override public void onClick(ClickEvent event) { @@ -46,7 +43,7 @@ } }); - gdlPanel = new GdlPanel(null, requestedTopicsToCreate); + gdlPanel = new GdlPanel(requestedTopicToEdit, null); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Mon Aug 29 02:32:41 2011 (r800) @@ -7,13 +7,11 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; @@ -261,8 +259,8 @@ @Override @Deprecated - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - return null; + public ArrayList<String> getSelectedValues(){ + return new ArrayList<String>(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Mon Aug 29 02:32:41 2011 (r800) @@ -6,11 +6,10 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; + public class GdlCheckBox extends GdlInputButton { protected GdlCheckBox(){ @@ -45,9 +44,9 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ + public ArrayList<String> getSelectedValues(){ // TODO: implement - return null; + return new ArrayList<String>(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Mon Aug 29 02:32:41 2011 (r800) @@ -7,11 +7,10 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; + public class GdlRadioButton extends GdlInputButton { protected GdlRadioButton(){ @@ -44,9 +43,9 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ + public ArrayList<String> getSelectedValues(){ // TODO: implement - return null; + return new ArrayList<String>(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Mon Aug 29 02:32:41 2011 (r800) @@ -4,11 +4,10 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; + public abstract class GdlComplexData extends GdlVisibleObject { // some constructors @@ -23,8 +22,8 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ + public ArrayList<String> getSelectedValues(){ // TODO: implement - return null; + return new ArrayList<String>(); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Mon Aug 29 02:32:41 2011 (r800) @@ -26,11 +26,9 @@ import com.google.gwt.event.dom.client.MouseUpEvent; import com.google.gwt.event.dom.client.MouseUpHandler; import com.google.gwt.event.shared.HandlerRegistration; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; @@ -444,8 +442,8 @@ @Override @Deprecated - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - return null; + public ArrayList<String> getSelectedValues(){ + return new ArrayList<String>(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Mon Aug 29 02:32:41 2011 (r800) @@ -26,12 +26,10 @@ import com.google.gwt.user.client.ui.CaptionPanel; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPosition; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; @@ -45,7 +43,6 @@ import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.text.GdlTextObject; import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; @@ -241,9 +238,9 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ + public ArrayList<String> getSelectedValues(){ // TODO: implement - return null; + return new ArrayList<String>(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Mon Aug 29 02:32:41 2011 (r800) @@ -9,14 +9,11 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlInfo extends GdlTextObject { @@ -107,8 +104,8 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; + @Deprecated + public ArrayList<String> getSelectedValues(){ + return new ArrayList<String>(); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 29 02:32:41 2011 (r800) @@ -8,7 +8,6 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; @@ -177,8 +176,6 @@ } } } - - // TODO: implement } @@ -193,8 +190,17 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; + public ArrayList<String> getSelectedValues(){ + ArrayList<String> result = new ArrayList<String>(); + for (Widget ctrl : this.subElements) { + if(ctrl instanceof ButtonableObject){ + Widget lb = ((ButtonableObject) ctrl).getMainObject(); + if(lb instanceof ListBox){ + ListBox lbi = (ListBox)lb; + result.add(lbi.getValue(lbi.getSelectedIndex())); + } + } + } + return result; } } \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Mon Aug 29 02:32:41 2011 (r800) @@ -14,11 +14,9 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Label; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -26,7 +24,6 @@ import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; @@ -188,9 +185,9 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; + @Deprecated + public ArrayList<String> getSelectedValues(){ + return new ArrayList<String>(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 29 02:32:41 2011 (r800) @@ -15,7 +15,6 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; @@ -641,9 +640,13 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ - // TODO: implement - return null; + public ArrayList<String> getSelectedValues(){ + ArrayList<String> result = new ArrayList<String>(); + for (Widget ctrl : this.subElements) + if(ctrl instanceof ButtonableObject) + if(((ButtonableObject) ctrl).getMainObject() instanceof TextArea) + result.add(((TextArea)((ButtonableObject)ctrl).getMainObject()).getValue()); + return result; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Mon Aug 29 02:32:41 2011 (r800) @@ -5,7 +5,6 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -436,9 +435,10 @@ @Override - public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ + @Deprecated + public ArrayList<String> getSelectedValues(){ // TODO: implement - return null; + return new ArrayList<String>(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Aug 29 02:04:14 2011 (r799) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Aug 29 02:32:41 2011 (r800) @@ -44,6 +44,14 @@ } + @Override + @Deprecated + public ArrayList<String> getSelectedValues(){ + // has no effect on this element + return new ArrayList<String>(); + } + + public String getViewName()throws InvalidGdlSchemaException { JsArray<Name> viewNames = super.tmRepresentative.getNames(tm.getTopicBySubjectIdentifier(tm.createLocator(PSIs.GDL.NameType.gdlViewName))); if(viewNames.length() != 1){

1 0

[isidorus-cvs] r799 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base text
by lgiessmann＠common-lisp.net 29 Aug '11

29 Aug '11

Author: lgiessmann Date: Mon Aug 29 02:04:14 2011 New Revision: 799 Log: gdl-frontend: Widgets: implemented the handler for the reset button of the Hash-Object CreatorView Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 29 01:39:52 2011 (r798) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 29 02:04:14 2011 (r799) @@ -12,6 +12,7 @@ import com.google.gwt.core.client.EntryPoint; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.HorizontalPanel; @@ -37,18 +38,20 @@ //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/test-env", TopicIdentifierTypes.SubjectIdentifier); //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); - GdlPanel.addClickHandler("unit_1_text_create_button_id", new ClickHandler() { + GdlPanel.addClickHandler("hash_object_reset_button_id", new ClickHandler() { @Override public void onClick(ClickEvent event) { - Window.alert("you clicked " + ((Button)event.getSource()).getText()); + DOM.getElementById("hash_object_text_key_id__GDL_0").setInnerText(""); + DOM.getElementById("hash_object_text_value_id__GDL_0").setInnerText(""); } }); + gdlPanel = new GdlPanel(null, requestedTopicsToCreate); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); gdlPanel.setCommitCallback(new CommitCallback()); - + Button requestButton = new Button("load schema"); requestButton.addClickHandler(new ClickHandler() { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 29 01:39:52 2011 (r798) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 29 02:04:14 2011 (r799) @@ -20,6 +20,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; + public class GdlListBox extends GdlTextObject { // some constructors protected GdlListBox() throws InvalidGdlSchemaException, ExecutionException {

1 0

[isidorus-cvs] r798 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view
by lgiessmann＠common-lisp.net 29 Aug '11

29 Aug '11

Author: lgiessmann Date: Mon Aug 29 01:39:52 2011 New Revision: 798 Log: gdl-frontend: Widgets: implemented the constructor and creation of GdlCreatorAssociationView Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Mon Aug 29 01:28:52 2011 (r797) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Mon Aug 29 01:39:52 2011 (r798) @@ -10,6 +10,10 @@ public GdlCreatorAssociationView(Topic tmRepresentative, Topic receivedData, GdlVisibleObject gdlParent) throws InvalidGdlSchemaException, ExecutionException { super(tmRepresentative, receivedData, gdlParent); - // TODO Auto-generated constructor stub + + + int minValues = this.getCardMin() == 0 ? 1 : this.getCardMax(); + for(int i = 0; i != minValues; ++i) + this.addToContainerPanel(new AssociationItem(this.tmRepresentative, null, this)); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Aug 29 01:28:52 2011 (r797) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Aug 29 01:39:52 2011 (r798) @@ -55,6 +55,7 @@ // content orientation has no effect on a view @Override + @Deprecated public void setContentOrientation(ContentOrientationValue value) throws InvalidGdlSchemaException, ExecutionException { // do nothing, no table is set for organizing content widgets, since a view does not organize // its content in this manner

1 0

[isidorus-cvs] r797 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: . base button complexData container text view
by lgiessmann＠common-lisp.net 29 Aug '11

29 Aug '11

Author: lgiessmann Date: Mon Aug 29 01:28:52 2011 New Revision: 797 Log: gdl-frontend: Widgets: implemented the handling of default/fixed-default values Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Mon Aug 29 01:28:52 2011 (r797) @@ -1,12 +1,4 @@ * finalise the GDL-Schema for creating and editing instances of tgm:Hash-Object => Hidden-Value (type-occurrence) + otherrole -* Implement all IHasValueGroup to: - * GdlText - * GdlInfo - * GdlTitle - * GdlReference - * GdlButton - * GdlComplexData - * GdlListBox * implement the handling of default-values * Implement TopicMaps data consumption * Implement TopicMaps data generation Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Mon Aug 29 01:28:52 2011 (r797) @@ -30,7 +30,15 @@ @Override + @Deprecated public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ return null; } + + + @Override + @Deprecated + public void fixValue(){ + // has no effect on this element + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Aug 29 01:28:52 2011 (r797) @@ -103,6 +103,10 @@ protected boolean displayByConstraintSet = false; protected ArrayList<String> literals = new ArrayList<String>(); protected boolean literalsSet = false; + protected int cardMin = 0; + protected boolean cardMinSet = false; + protected int cardMax = 0; + protected boolean cardMaxSet = false; // some constructors @@ -1877,6 +1881,11 @@ } + // if this method is called the user cannot change the represented value + // of this control + public abstract void fixValue(); + + // sets the fields for the received data protected void setReceivedData() throws InvalidGdlSchemaException, ExecutionException { if(receivedData == null) return; @@ -1943,22 +1952,51 @@ protected void setDefaultValue() throws InvalidGdlSchemaException, ExecutionException { if(this.getDefaultLiteralValue() != null && this.getDefaultTmValue() != null) throw new InvalidGdlSchemaException("the topic " + TmHelper.getAnyIdOfTopic(this.getValueGroup()) + " must be bound to maximal one " + PSIs.GDL.TopicType.gdlDefaultValue + ", but is: 2"); - // TODO: check if the valus is fixed => fix the element, so that the - // user cannot change the value => implement an abstract method therefore if(this.getDefaultLiteralValue() != null){ TopicMap tm = this.getDefaultLiteralValue().getTopicMap(); Topic occType = TmHelper.getTopicByPsi(PSIs.GDL.OccurrenceType.gdlLiteralValue, tm); JsArray<Occurrence> vals = this.getDefaultLiteralValue().getOccurrences(occType); + if(vals.length() != 1) throw new InvalidGdlSchemaException("the topic " + TmHelper.getAnyIdOfTopic(this.getDefaultLiteralValue()) + " must be bound exactly once to a " + PSIs.GDL.OccurrenceType.gdlLiteralValue + " occurrence, but is: " + vals.length()); - this.addSubItem(vals.get(0).getValue()); + int minValues = this.getCardMin() == 0 ? 1 : this.getCardMin(); + for(int i = 0; i < minValues; ++i) + this.addSubItem(vals.get(0).getValue()); + if(this.fixedDefaultValue()) this.fixValue(); } else if(this.getDefaultTmValue() != null){ - // TODO: set default-tm-value + ArrayList<Topic> values = TmHelper.getValuesForTmValue(this.getDefaultTmValue()); + + if(values.size() != 1) throw new InvalidGdlSchemaException("the default value " + TmHelper.getAnyIdOfTopic(this.getDefaultValue()) + " represetns more than one value"); + + int minValues = this.getCardMin() == 0 ? 1 : this.getCardMin(); + for(int i = 0; i < minValues; ++i) + this.addSubItem(this.getTopicRepresentation(this.getDefaultTmValue(), this.getDisplayByOfTmValue(this.getDefaultTmValue()), this.getPreferredScopeOfTmValue(this.getDefaultTmValue()))); + if(this.fixedDefaultValue()) this.fixValue(); } else { this.addSubItem(""); } } + + public int getCardMin() throws InvalidGdlSchemaException { + if(this.cardMinSet){ + return this.cardMin; + } else { + this.cardMaxSet = true; + return TmHelper.getCardMin(this.getRootConstraint()); + } + } + + + public int getCardMax() throws InvalidGdlSchemaException { + if(this.cardMaxSet){ + return this.cardMax; + } else { + this.cardMaxSet = true; + return TmHelper.getCardMax(this.getRootConstraint()); + } + } + // returns the topic instance of gdlt:Value-Group that is bound to this // visible element, or null if it is unbound Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Aug 29 01:28:52 2011 (r797) @@ -2,6 +2,8 @@ +import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TmEngine.jtmsBasedEngine.JtmsTmEngine; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; @@ -27,22 +29,21 @@ mainPanel.setBorderWidth(1); mainPanel.setPixelSize(1000, 600); - //ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); - //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); + ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Hash-Object", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/Environment", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Poet", TopicIdentifierTypes.SubjectIdentifier)); //requestedTopicsToCreate.add(new Pair<String, TopicIdentifierTypes>("http://psi.test.org/gdl-test/Musician", TopicIdentifierTypes.SubjectIdentifier)); //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/test-env", TopicIdentifierTypes.SubjectIdentifier); - //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/model/types/test-hash", TopicIdentifierTypes.SubjectIdentifier); - Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); + //Pair<String, TopicIdentifierTypes> requestedTopicToEdit = new Pair<String, TopicIdentifierTypes>("http://textgrid.org/serviceregistry/test-hash-2", TopicIdentifierTypes.SubjectIdentifier); GdlPanel.addClickHandler("unit_1_text_create_button_id", new ClickHandler() { @Override public void onClick(ClickEvent event) { Window.alert("you clicked " + ((Button)event.getSource()).getText()); } }); - gdlPanel = new GdlPanel(requestedTopicToEdit, null); + gdlPanel = new GdlPanel(null, requestedTopicsToCreate); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.java Mon Aug 29 01:28:52 2011 (r797) @@ -768,7 +768,7 @@ // E.g. a value group may be bound to a gdl:Type constraint and this constraint may be bound // to a tmcl:constraint, the root constraint is the instance of the tmcl:constraint public static Topic getRootConstraintOfValueGroup(Topic valueGroup, Topic currentConstraint) throws InvalidGdlSchemaException { - if(valueGroup == null) return null; + if(valueGroup == null || currentConstraint == null) return null; Topic localCurrentConstraint = currentConstraint == null ? getConstraintOfValueGroup(valueGroup) : currentConstraint; TopicMap tm = valueGroup.getTopicMap(); @@ -790,7 +790,7 @@ if(nextTmclConstraints.size() == 1) return nextTmclConstraints.get(0); else if(nextGdlConstraints.size() == 1) return getRootConstraintOfValueGroup(valueGroup, nextGdlConstraints.get(0)); - else throw new InvalidGdlSchemaException("the value group " + getAnyIdOfTopic(valueGroup) + " must be bound to exaclty on root constraint of the type " + PSIs.TMCL.tmclConstraint + " but is unbound"); + else throw new InvalidGdlSchemaException("the value group " + getAnyIdOfTopic(valueGroup) + " must be bound to exaclty one root constraint of the type " + PSIs.TMCL.tmclConstraint + " but is unbound"); } } @@ -821,10 +821,9 @@ Topic valueBindingAssocTopic = getTopicByPsi(PSIs.GDL.AssociationType.gdlValueBinding, tm); Topic valueGroupRoleType = getTopicByPsi(PSIs.GDL.RoleType.gdlValueGroup, tm); Topic valueRoleType = getTopicByPsi(PSIs.GDL.RoleType.gdlValue, tm); - Topic defaultLiteralValueType = getTopicByPsi(PSIs.GDL.TopicType.gdlDefaultLiteralValue, tm); - + Topic defaultLiteralValueType = getTopicByPsi(PSIs.GDL.TopicType.gdlDefaultLiteralValue, tm); ArrayList<Topic> defaultTmValues = getOtherPlayerOfBinaryAssociation(valueGroup, valueGroupRoleType, valueBindingAssocTopic, null, defaultLiteralValueType, valueRoleType); - + if(defaultTmValues.size() == 1) return defaultTmValues.get(0); else if(defaultTmValues.size() == 0) return null; else throw new InvalidGdlSchemaException("the topic " + getAnyIdOfTopic(valueGroup) + " must be bound none or once to a " + PSIs.GDL.TopicType.gdlDefaultLiteralValue + ", but is: " + defaultTmValues.size()); @@ -1193,6 +1192,39 @@ } } + + // returns an integer representing the tmcl:card-min value + public static int getCardMin(Topic constraint) throws InvalidGdlSchemaException { + if(constraint == null) return 0; + Occurrence occ = getSingleOccurrence(constraint, getTopicByPsi(PSIs.TMCL.tmclCardMin, constraint.getTopicMap())); + if(occ == null){ + return 0; + } else { + try{ + return Integer.parseInt(occ.getValue()); + }catch(NumberFormatException e){ + throw new InvalidGdlSchemaException("the occurrence " + PSIs.TMCL.tmclCardMin + " of the constraint " + getAnyIdOfTopic(constraint) + " must be an integer, but is: " + occ.getValue()); + } + } + } + + + // returns an integer representing the tmcl:card-max value or -1 + // if infinite + public static int getCardMax(Topic constraint) throws InvalidGdlSchemaException { + if(constraint == null) return 0; + Occurrence occ = getSingleOccurrence(constraint, getTopicByPsi(PSIs.TMCL.tmclCardMax, constraint.getTopicMap())); + if(occ == null){ + return 0; + } else { + try{ + return Integer.parseInt(occ.getValue()); + }catch(NumberFormatException e){ + throw new InvalidGdlSchemaException("the occurrence " + PSIs.TMCL.tmclCardMax + " of the constraint " + getAnyIdOfTopic(constraint) + " must be an integer, but is: " + occ.getValue()); + } + } + } + // returns the actual list of values for a TM-Value instance, i.e. // *(Default-)TM-Type-Value: returns all topic instances that are Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Mon Aug 29 01:28:52 2011 (r797) @@ -31,8 +31,8 @@ public GdlActionButton(Topic tmRepresentative, Construct receivedData, GdlVisibleObject gdlParent) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative, receivedData, gdlParent); - - this.createNewButton().setText("Action-Button"); // TODO: remove set text + + this.setDefaultValue(); this.setClickHandlers(); } @@ -260,7 +260,15 @@ @Override + @Deprecated public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ return null; } + + + @Override + @Deprecated + public void fixValue(){ + // has no effect on this element + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Mon Aug 29 01:28:52 2011 (r797) @@ -49,4 +49,10 @@ // TODO: implement return null; } + + + @Override + public void fixValue(){ + // TODO: implement + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Mon Aug 29 01:28:52 2011 (r797) @@ -48,4 +48,10 @@ // TODO: implement return null; } + + + @Override + public void fixValue(){ + // TODO: implement + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java Mon Aug 29 01:28:52 2011 (r797) @@ -23,4 +23,10 @@ public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { // TODO: implement } + + + @Override + public void fixValue(){ + // TODO: implement + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Mon Aug 29 01:28:52 2011 (r797) @@ -92,6 +92,12 @@ } + @Override + public void fixValue(){ + // TODO: implement + } + + protected class DateWidget extends DatePicker implements HasFocusHandlers, HasBlurHandlers, HasMouseDownHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseUpHandlers { public void setId(String id){ DOM.setElementAttribute(this.getElement(), "id", id); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java Mon Aug 29 01:28:52 2011 (r797) @@ -25,6 +25,12 @@ @Override public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { // TODO: implement - + } + + + @Override + @Deprecated + public void fixValue(){ + // TODO: implement } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlImage.java Mon Aug 29 01:28:52 2011 (r797) @@ -22,6 +22,11 @@ @Override public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { // TODO: implement - + } + + + @Override + public void fixValue(){ + // TODO: implement } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java Mon Aug 29 01:28:52 2011 (r797) @@ -25,6 +25,11 @@ @Override public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { // TODO: implement - + } + + + @Override + public void fixValue(){ + // TODO: implement } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlVideo.java Mon Aug 29 01:28:52 2011 (r797) @@ -22,6 +22,12 @@ @Override public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { // TODO: implement - + } + + + @Override + @Deprecated + public void fixValue(){ + // TODO: implement } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Mon Aug 29 01:28:52 2011 (r797) @@ -443,7 +443,15 @@ @Override + @Deprecated public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ return null; } + + + @Override + @Deprecated + public void fixValue(){ + // has no effect on this element + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Mon Aug 29 01:28:52 2011 (r797) @@ -228,6 +228,13 @@ @Override + @Deprecated + public void fixValue(){ + // has no effect on this element + } + + + @Override public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { // this method has no effect on this class } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Mon Aug 29 01:28:52 2011 (r797) @@ -54,6 +54,13 @@ } + @Override + @Deprecated + public void fixValue(){ + // has no effect on this element + } + + private void setParentListener(){ if(this.parent != null && !this.parentListenerSet){ parent.addMouseOverHandler(new MouseOverHandler() { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Aug 29 01:28:52 2011 (r797) @@ -9,6 +9,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; +import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; @@ -164,6 +165,21 @@ // directly when calling the ListBox constructor } + + @Override + public void fixValue(){ + for (Widget ctrl : this.subElements) { + if(ctrl instanceof ButtonableObject){ + Widget lb = ((ButtonableObject) ctrl).getMainObject(); + if(lb instanceof ListBox){ + ((ListBox)lb).setEnabled(false); + } + } + } + + // TODO: implement + } + // sets the css properties, by calling the super class's method and the local // method, which sets some specific properties for the GdlText instance Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Mon Aug 29 01:28:52 2011 (r797) @@ -54,6 +54,13 @@ } + @Override + @Deprecated + public void fixValue(){ + // has no effect on this element + } + + private ReferenceWidget createReference() throws InvalidGdlSchemaException, ExecutionException { ReferenceWidget reference = new ReferenceWidget(); DOM.setElementAttribute(reference.getElement(), "id", this.getId() + "__GDL_" + this.subElements.size()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Aug 29 01:28:52 2011 (r797) @@ -64,6 +64,19 @@ } + @Override + public void fixValue(){ + for (Widget ctrl : this.subElements) { + if(ctrl instanceof ButtonableObject){ + Widget mo = ((ButtonableObject) ctrl).getMainObject(); + if(mo instanceof TextArea){ + ((TextArea)mo).setReadOnly(true); + } + } + } + } + + // creates a new TextArea item, adds it to the subElements array, // and applies the styles on it protected TextArea createNewTextArea() throws InvalidGdlSchemaException, ExecutionException { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Mon Aug 29 01:28:52 2011 (r797) @@ -442,6 +442,13 @@ } + @Override + @Deprecated + public void fixValue(){ + // has no effect on this element + } + + // this class represents the acutal content of this widget, i.e. // it wraps a h1, h2, h3 or h4 element protected class TitleWidget extends Composite implements HasMouseDownHandlers, HasMouseUpHandlers, HasMouseOverHandlers, HasMouseOutHandlers, HasBlurHandlers, HasFocusHandlers{ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Aug 29 01:03:07 2011 (r796) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Aug 29 01:28:52 2011 (r797) @@ -31,11 +31,19 @@ @Override + @Deprecated public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { //this method has no effect on this class } + @Override + @Deprecated + public void fixValue(){ + // has no effect on this element + } + + public String getViewName()throws InvalidGdlSchemaException { JsArray<Name> viewNames = super.tmRepresentative.getNames(tm.getTopicBySubjectIdentifier(tm.createLocator(PSIs.GDL.NameType.gdlViewName))); if(viewNames.length() != 1){

1 0

[isidorus-cvs] r796 - branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets
by lgiessmann＠common-lisp.net 29 Aug '11

29 Aug '11

Author: lgiessmann Date: Mon Aug 29 01:03:07 2011 New Revision: 796 Log: gdl-frontend: Widgets: fixed a bung in the GDL-Schema for the TextGrid-ServiceRegistry => default-value of reset-button Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Fri Aug 26 06:11:38 2011 (r795) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_GDL_Create_HashObject.jtm Mon Aug 29 01:03:07 2011 (r796) @@ -212,7 +212,7 @@ {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-creator-reset-button]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-reset-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-creator-text-value]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-creator-reset-button]"}]}, {"type":"si:[gdl:value-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-creator-reset-button-value-group]"},{"type":"si:[gdl:value]", "player":"si:[tgg:hash-object-creator-reset-button-value]"}]}, - {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-creator-reset-button-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-reset-button-value]"}]}, + {"type":"si:[gdl:view-binding]", "roles":[{"type":"si:[gdl:value-group]", "player":"si:[tgg:hash-object-creator-reset-button-value-group]"},{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-reset-button]"}]}, {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[tgg:hash-object-default-creator-topic-view]"},{"type":"si:[gdl:containee]", "player":"si:[tgg:hash-object-creator-commit-button]"}]}, {"type":"si:[gdl:position]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[tgg:hash-object-creator-commit-button-position]"},{"type":"si:[gdl:ancestor]", "player":"si:[tgg:hash-object-creator-reset-button]"},{"type":"si:[gdl:descendant]", "player":"si:[tgg:hash-object-creator-commit-button]"}]} Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm Fri Aug 26 06:11:38 2011 (r795) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.jtm Mon Aug 29 01:03:07 2011 (r796) @@ -11478,7 +11478,7 @@ "item_identifiers":null, "type":"si:[pref_3:descriptor]", "reifier":null, - "player":"si:[pref_1:hash-object-creator-reset-button-value]" + "player":"si:[pref_1:hash-object-creator-reset-button]" } ] }, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm Fri Aug 26 06:11:38 2011 (r795) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_full_TMCL_and_GDL_Schema.xtm Mon Aug 29 01:03:07 2011 (r796) @@ -9876,7 +9876,7 @@ <t:type> <t:topicRef href="#t2656" /> </t:type> - <t:topicRef href="#t3041" /> + <t:topicRef href="#t3026" /> </t:role> </t:association> Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm Fri Aug 26 06:11:38 2011 (r795) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.jtm Mon Aug 29 01:03:07 2011 (r796) @@ -5362,7 +5362,7 @@ "item_identifiers":null, "type":"si:[pref_3:descriptor]", "reifier":null, - "player":"si:[pref_1:hash-object-creator-reset-button-value]" + "player":"si:[pref_1:hash-object-creator-reset-button]" } ] }, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm Fri Aug 26 06:11:38 2011 (r795) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema.xtm Mon Aug 29 01:03:07 2011 (r796) @@ -5034,7 +5034,7 @@ <t:type> <t:topicRef href="#t2661" /> </t:type> - <t:topicRef href="#t3036" /> + <t:topicRef href="#t3026" /> </t:role> <t:role> <t:type> Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Fri Aug 26 06:11:38 2011 (r795) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/TextGrid_ServiceRegistry_required_TMCL_and_GDL_Schema_with_test_data.jtm Mon Aug 29 01:03:07 2011 (r796) @@ -1280,7 +1280,7 @@ ], "subject_locators":null, "item_identifiers":null, - "instance_of":["si:[pref_2:List-Box]" + "instance_of":["si:[pref_2:Text]" ], "names":null, "occurrences":[{ @@ -5418,7 +5418,7 @@ "item_identifiers":null, "type":"si:[pref_3:descriptor]", "reifier":null, - "player":"si:[pref_1:hash-object-creator-reset-button-value]" + "player":"si:[pref_1:hash-object-creator-reset-button]" } ] },

1 0

[isidorus-cvs] r795 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base button complexData container text view
by lgiessmann＠common-lisp.net 26 Aug '11

26 Aug '11

Author: lgiessmann Date: Fri Aug 26 06:11:38 2011 New Revision: 795 Log: gdl-frontend: Widgets: changed the signature of GdlVisibleObject.getContent Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Fri Aug 26 06:11:38 2011 (r795) @@ -2,6 +2,7 @@ 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; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -259,9 +260,9 @@ // this method is responsible for generating a Topic Map fo the user's // data by using the view's getContent method. - public TopicMap generateTopicMap() throws Exception { + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent() throws Exception { try{ - return (TopicMap)this.view.getContent().getFirst(); + return this.view.getContent(); }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.TopicMapsGenerationError, e); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Fri Aug 26 06:11:38 2011 (r795) @@ -1,12 +1,13 @@ package us.isidor.gdl.anaToMia.Widgets.base; +import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; -import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; public class GdlSpace extends GdlVisibleObject { // some constructors @@ -29,7 +30,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ return null; } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Aug 26 06:11:38 2011 (r795) @@ -2170,5 +2170,5 @@ // returns the actual data that is hold by this instance - public abstract Pair<Construct, TopicMapsTypes> getContent(); + public abstract ArrayList<Pair<Construct, TopicMapsTypes>> getContent(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Fri Aug 26 06:11:38 2011 (r795) @@ -260,7 +260,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ return null; } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Fri Aug 26 06:11:38 2011 (r795) @@ -1,5 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import java.util.ArrayList; + import com.google.gwt.user.client.ui.CheckBox; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; @@ -43,7 +45,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Fri Aug 26 06:11:38 2011 (r795) @@ -1,6 +1,8 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import java.util.ArrayList; + import com.google.gwt.user.client.ui.RadioButton; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; @@ -42,7 +44,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Fri Aug 26 06:11:38 2011 (r795) @@ -1,5 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; @@ -21,7 +23,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Fri Aug 26 06:11:38 2011 (r795) @@ -443,7 +443,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ return null; } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Fri Aug 26 06:11:38 2011 (r795) @@ -234,7 +234,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Fri Aug 26 06:11:38 2011 (r795) @@ -1,5 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.text; +import java.util.ArrayList; + import com.google.gwt.event.dom.client.MouseOutEvent; import com.google.gwt.event.dom.client.MouseOutHandler; import com.google.gwt.event.dom.client.MouseOverEvent; @@ -98,7 +100,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Fri Aug 26 06:11:38 2011 (r795) @@ -176,7 +176,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Aug 26 06:11:38 2011 (r795) @@ -1,5 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.text; +import java.util.ArrayList; + import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.ClickEvent; @@ -179,7 +181,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Aug 26 06:11:38 2011 (r795) @@ -628,7 +628,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Aug 26 06:11:38 2011 (r795) @@ -436,7 +436,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 26 06:11:38 2011 (r795) @@ -184,7 +184,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } @@ -297,7 +297,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Fri Aug 26 06:11:38 2011 (r795) @@ -1,5 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.view; +import java.util.ArrayList; + import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; @@ -18,7 +20,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Aug 26 06:02:26 2011 (r794) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Aug 26 06:11:38 2011 (r795) @@ -74,7 +74,7 @@ @Override - public Pair<Construct, TopicMapsTypes> getContent(){ + public ArrayList<Pair<Construct, TopicMapsTypes>> getContent(){ // TODO: implement return null; }

1 0

[isidorus-cvs] r794 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base button complexData container text view
by lgiessmann＠common-lisp.net 26 Aug '11

26 Aug '11

Author: lgiessmann Date: Fri Aug 26 06:02:26 2011 New Revision: 794 Log: gdl-frontend: Widgets: added the method getContent to GdlVisibleObject Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Fri Aug 26 06:02:26 2011 (r794) @@ -261,7 +261,7 @@ // data by using the view's getContent method. public TopicMap generateTopicMap() throws Exception { try{ - return this.view.getContent(); + return (TopicMap)this.view.getContent().getFirst(); }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.TopicMapsGenerationError, e); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Fri Aug 26 06:02:26 2011 (r794) @@ -2,8 +2,11 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; public class GdlSpace extends GdlVisibleObject { // some constructors @@ -23,4 +26,10 @@ public void addSubItem(String value){ // this method has no effect on GdlSpace instances } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Fri Aug 26 06:02:26 2011 (r794) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.base; import java.util.ArrayList; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name; @@ -11,6 +10,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Variant; import us.isidor.gdl.anaToMia.Widgets.button.GdlActionButton; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -2167,4 +2167,8 @@ public String getTopicRepresentation(Topic topicToRepresent, Topic displayBy, ArrayList<Topic> preferredScopes) throws InvalidGdlSchemaException { return TmHelper.getTopicRepresentation(topicToRepresent, displayBy, preferredScopes); } + + + // returns the actual data that is hold by this instance + public abstract Pair<Construct, TopicMapsTypes> getContent(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.java Fri Aug 26 06:02:26 2011 (r794) @@ -7,11 +7,13 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; @@ -255,4 +257,10 @@ if(this.subElements.size() == 0) return null; else return (Button)this.subElements.get(0); } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.java Fri Aug 26 06:02:26 2011 (r794) @@ -4,9 +4,11 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlCheckBox extends GdlInputButton { protected GdlCheckBox(){ @@ -38,4 +40,11 @@ public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { // TODO: implement } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.java Fri Aug 26 06:02:26 2011 (r794) @@ -3,7 +3,6 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Button; @@ -38,7 +37,7 @@ @Override public void onClick(ClickEvent event) { - + Window.alert("content: " + this.owner.getContent()); } } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.java Fri Aug 26 06:02:26 2011 (r794) @@ -5,9 +5,11 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlRadioButton extends GdlInputButton { protected GdlRadioButton(){ @@ -37,4 +39,11 @@ public void addSubItem(String value) throws InvalidGdlSchemaException, ExecutionException { // TODO: implement } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlComplexData.java Fri Aug 26 06:02:26 2011 (r794) @@ -2,9 +2,11 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public abstract class GdlComplexData extends GdlVisibleObject { // some constructors @@ -16,4 +18,11 @@ public GdlComplexData(Topic tmRepresentative, Construct receivedData, GdlVisibleObject gdlParent) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative, receivedData, gdlParent); } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Fri Aug 26 06:02:26 2011 (r794) @@ -30,6 +30,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; @@ -439,4 +440,10 @@ public ArrayList<Pair<Topic, Integer>> containsItems() throws InvalidGdlSchemaException{ return TmHelper.listContains(super.getTmRepresentative()); } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Fri Aug 26 06:02:26 2011 (r794) @@ -31,6 +31,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPosition; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; @@ -44,6 +45,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.text.GdlTextObject; import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; @@ -231,6 +233,13 @@ } + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } + + protected class UnitWidget extends Composite implements HasFocusHandlers, HasBlurHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseDownHandlers, HasMouseUpHandlers{ private CaptionPanel basePanel = new CaptionPanel(); private AbsolutePanel containerPanel = new AbsolutePanel(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.java Fri Aug 26 06:02:26 2011 (r794) @@ -10,9 +10,11 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public class GdlInfo extends GdlTextObject { @@ -93,4 +95,11 @@ public void hide(){ DOM.setStyleAttribute(this.mainPanel.getElement(), "display", "none"); } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Fri Aug 26 06:02:26 2011 (r794) @@ -8,6 +8,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; @@ -172,4 +173,11 @@ this.setSize(widget, this.getSize()); } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } } \ No newline at end of file Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Fri Aug 26 06:02:26 2011 (r794) @@ -16,6 +16,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -23,6 +24,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.HoverStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; @@ -176,6 +178,13 @@ } + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } + + // this class wraps a Label that is used as protected class ReferenceWidget extends Label implements HasFocusHandlers, HasBlurHandlers { private String href = ""; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Fri Aug 26 06:02:26 2011 (r794) @@ -15,6 +15,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; @@ -626,6 +627,13 @@ } + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } + + // like setGdlStyle, except the width, minwidth, maxWidth, height, minHeight and maxHeight properties // are not set. This method should only be invoked of the onFocusEnd, onActiveEnd and onHoverEnd // to avoid the resizing of resizeable textarea elements Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Fri Aug 26 06:02:26 2011 (r794) @@ -5,6 +5,7 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -434,6 +435,13 @@ } + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } + + // this class represents the acutal content of this widget, i.e. // it wraps a h1, h2, h3 or h4 element protected class TitleWidget extends Composite implements HasMouseDownHandlers, HasMouseUpHandlers, HasMouseOverHandlers, HasMouseOutHandlers, HasBlurHandlers, HasFocusHandlers{ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Fri Aug 26 06:02:26 2011 (r794) @@ -7,9 +7,10 @@ import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.PSIs; @@ -180,6 +181,13 @@ return this.validRoleCombinations; } } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } // This class represents a single association that is displayed. @@ -289,11 +297,9 @@ @Override - @Deprecated - public TopicMap getContent() { - // this item has no content that is a Topic Map item! + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement return null; } - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Fri Aug 26 06:02:26 2011 (r794) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.view; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -13,11 +12,4 @@ super(tmRepresentative, receivedData, gdlParent); // TODO Auto-generated constructor stub } - - - @Override - public TopicMap getContent() { - // TODO Auto-generated method stub - return null; - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Fri Aug 26 06:02:26 2011 (r794) @@ -2,7 +2,6 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -17,13 +16,6 @@ this.rootPanel = rootPanel; // TODO Auto-generated constructor stub } - - - @Override - public TopicMap getContent() { - // TODO Auto-generated method stub - return null; - } @Override Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Fri Aug 26 06:02:26 2011 (r794) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.view; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -16,12 +15,6 @@ this.rootPanel = rootPanel; // TODO Auto-generated constructor stub } - - @Override - public TopicMap getContent() { - // TODO Auto-generated method stub - return null; - } @Override Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Fri Aug 26 06:02:26 2011 (r794) @@ -1,9 +1,12 @@ package us.isidor.gdl.anaToMia.Widgets.view; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; public abstract class GdlDefaultTopicView extends GdlTopicView { @@ -12,4 +15,11 @@ // TODO Auto-generated constructor stub } // TODO: implement + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Fri Aug 26 06:02:26 2011 (r794) @@ -6,7 +6,6 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; @@ -118,18 +117,4 @@ if(this.associationsToRepresentSet) return this.associationsToRepresent; else return this.filterAssociations(); } - - - @Override - public String getViewName() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public TopicMap getContent() { - // TODO Auto-generated method stub - return null; - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Fri Aug 26 06:02:26 2011 (r794) @@ -2,7 +2,6 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -14,11 +13,4 @@ super(tmRepresentative, null, gdlParent); // TODO Auto-generated constructor stub } - - - @Override - public TopicMap getContent() { - // TODO Auto-generated method stub - return null; - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Fri Aug 26 06:02:26 2011 (r794) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.view; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; @@ -15,10 +14,4 @@ super(tmRepresentative, receivedData, gdlParent); // TODO Auto-generated constructor stub } - - @Override - public TopicMap getContent() { - // TODO Auto-generated method stub - return null; - } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Fri Aug 26 06:02:26 2011 (r794) @@ -2,12 +2,16 @@ import java.util.ArrayList; import com.google.gwt.user.client.ui.Widget; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; @@ -67,4 +71,11 @@ this.setClear(this.getClear()); this.setGdlStyle(this.mainPanel); } + + + @Override + public Pair<Construct, TopicMapsTypes> getContent(){ + // TODO: implement + return null; + } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Fri Aug 26 01:59:14 2011 (r793) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Fri Aug 26 06:02:26 2011 (r794) @@ -7,7 +7,6 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Name; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; import us.isidor.gdl.anaToMia.Widgets.base.GdlPosition; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.IGdlContainer; @@ -93,7 +92,4 @@ public ArrayList<Topic> contains() throws InvalidGdlSchemaException{ return TmHelper.topicContains(this.tmRepresentative); } - - - public abstract TopicMap getContent(); } \ No newline at end of file

1 0