[isidorus-cvs] r795 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base button complexData container text view - isidorus-cvs@common-lisp.net - mailman3.common-lisp.net

26 Aug 2011

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;
    }

    