Changeset 813

Timestamp:

08/30/11 13:17:28 (14 years ago)

Author:

lgiessmann

Message:

gdl-frontend: Widgets: fixed a bug in GdlVisibleObject?.getContent()

Location:

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets

Files:

• button/GdlCommitButton.java (modified) (2 diffs)
• view/GdlAssociationView.java (modified) (1 diff)
• view/GdlTopicView.java (modified) (2 diffs)

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.java ¶

@@ -1 +1 @@
 package us.isidor.gdl.anaToMia.Widgets.button;
 
+import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct;
+import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
 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;
 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.TopicMapsTypes;
 
 
@@ -38 +42 @@
                 public void onClick(ClickEvent event) {
                         try{
-                                Window.alert(" >> " + this.owner.getGdlParent().getContent(null).size());
+                                TmEngine tmEngine = this.owner.getRoot().getTmEngine();
+                                for (Pair<Construct, TopicMapsTypes> pair : this.owner.getGdlParent().getContent(null)) {
+                                        String str = "";
+                                        if(pair.getSecond().equals(TopicMapsTypes.Topic)){
+                                                str = tmEngine.exportTm((Topic)pair.getFirst());
+                                        } else if(pair.getSecond().equals(TopicMapsTypes.Association)){
+                                                str = tmEngine.exportTm((Association)pair.getFirst());
+                                        }
+                                
+                                        Window.alert(str);
+                                }
                                 
                                 // TODO: implement

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java ¶

@@ -3 +3 @@
 import java.util.ArrayList;
 import com.google.gwt.core.client.JsArray;
-import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.VerticalPanel;

branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java ¶

@@ -84 +84 @@
                                 
                 for (Widget ctrl : this.subElements) {
-                        if(this.receivedData == null) result.add(new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Topic));
+                        Pair<Construct, TopicMapsTypes> topicPair = new Pair<Construct, TopicMapsTypes>(localCarrier, TopicMapsTypes.Topic);
+                        if(this.receivedData == null && !result.contains(topicPair)) result.add(topicPair);
                         if(ctrl instanceof GdlVisibleObject){
                                 for (Pair<Construct, TopicMapsTypes> pair : ((GdlVisibleObject)ctrl).getContent(localCarrier)) {
-                                        if(this.receivedData != null)result.add(pair);
+                                        if(this.receivedData != null || (ctrl instanceof GdlView))result.add(pair);
                                 }
                         }
@@ -111 +112 @@
         
         
+        // returns the recieved topic or creates a topic stub
         public Topic getRepresentedTopic(){
                 if(this.receivedData ==null){