[isidorus-cvs] r686 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base complexData text view
Author: lgiessmann Date: Thu Jul 28 02:20:26 2011 New Revision: 686
Log: gdl-frontend: Widgets: removed the interface IGdlHasValue (the interface IgdlHasValueGroup will used instead)
Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/IGdlHasValue.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/complexData/GdlDatePicker.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/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/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/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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Thu Jul 28 02:20:26 2011 (r686) @@ -11,7 +11,6 @@ import us.isidor.gdl.anaToMia.Widgets.environment.IDeleteCallback; import us.isidor.gdl.anaToMia.Widgets.environment.IOnErrorCallback; import us.isidor.gdl.anaToMia.Widgets.environment.ILoadSchemaCallback; -import us.isidor.gdl.anaToMia.Widgets.environment.InvalidContentException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultTopicView; @@ -225,21 +224,18 @@ // onValidateHandlers are executed public void doValidate() { try{ - if(tmEngine == null || requestedSchemaTm == null){ + if(tmEngine == null || requestedSchemaTm == null) throw new ExecutionException("No Topic Maps engine was set yet"); - } - if(!this.view.validate()){ - throw new InvalidContentException("The topic map content is not valid:\n" + tmEngine.exportTm(view.getContent())); - } - }catch(InvalidContentException e){ - for (IOnErrorCallback handler : localOnErrorContainer) { - handler.onError(GdlErrorTypes.ValidateError, e); - } + // TODO: validate + // throw new InvalidContentException("The topic map content is not valid:\n" + tmEngine.exportTm(view.getContent())); + + //}catch(InvalidContentException e){ + // for (IOnErrorCallback handler : localOnErrorContainer) + // handler.onError(GdlErrorTypes.ValidateError, e); } catch(Exception e){ - for (IOnErrorCallback handler : localOnErrorContainer) { + for (IOnErrorCallback handler : localOnErrorContainer) handler.onError(GdlErrorTypes.ExecutionError, e); - } } } @@ -249,17 +245,16 @@ // onDeleteHandlers are executed and the panel's content is removed public void doDelete() { try{ - if(tmEngine == null || requestedSchemaTm == null){ + if(tmEngine == null || requestedSchemaTm == null) throw new ExecutionException("No Topic Maps engine was set yet"); - } - if(this.deleteCallback == null){ + + if(this.deleteCallback == null) throw new ExecutionException("No DeleteCallback was set yet"); - } + this.deleteCallback.deleteTmConstruct(requestedSchemaTm, TopicMapsTypes.TopicMap); }catch(Exception e){ - for (IOnErrorCallback handler : localOnErrorContainer) { + for (IOnErrorCallback handler : localOnErrorContainer) handler.onError(GdlErrorTypes.DeleteError, e); - } } }
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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,6 +1,5 @@ package us.isidor.gdl.anaToMia.Widgets.complexData;
-import java.util.ArrayList;
import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; @@ -24,19 +23,16 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.datepicker.client.DatePicker; 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.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; 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;
-public class GdlDatePicker extends GdlComplexData implements IGdlHasValue { +public class GdlDatePicker extends GdlComplexData {
// some constructors protected GdlDatePicker(){ @@ -77,29 +73,7 @@ public ButtonableObject removeDatePicker(DateWidget elem) throws InvalidGdlSchemaException, ExecutionException{ return this.removeFromContainer(elem); - } - - - @Override - public ArrayList<String> getStringValue() { - // TODO: implement - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - + } protected class DateWidget extends DatePicker implements HasFocusHandlers, HasBlurHandlers, HasMouseDownHandlers, HasMouseOutHandlers, HasMouseOverHandlers, HasMouseUpHandlers {
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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Thu Jul 28 02:20:26 2011 (r686) @@ -6,13 +6,9 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Widget; - 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.GdlPsis; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -20,7 +16,7 @@ import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
-public class GdlListBox extends GdlTextObject implements IGdlHasValue{ +public class GdlListBox extends GdlTextObject { // some constructors protected GdlListBox() throws InvalidGdlSchemaException, ExecutionException { super(); @@ -153,30 +149,4 @@ this.setSize(widget, this.getSize()); this.setOnePerGroup(widget, this.getOnePerGroup()); } - - - // returns an ArrayList of string that contains all selected values - @Override - public ArrayList<String> getStringValue() { - ArrayList<String> results = new ArrayList<String>(); - for (Widget elem : super.subElements) { - ListBox lb = (ListBox)((ButtonableObject)elem).getMainObject(); - if(lb.getSelectedIndex() != -1) results.add(lb.getValue(lb.getSelectedIndex())); - } - return results; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } } \ 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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,7 +1,5 @@ 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; @@ -14,25 +12,20 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Widget; 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.GdlPsis; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; 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;
-public class GdlReference extends GdlTextObject implements IGdlHasValue{ +public class GdlReference extends GdlTextObject{ // some constructors protected GdlReference() throws InvalidGdlSchemaException, ExecutionException { super(); @@ -150,30 +143,6 @@ } - @Override - public ArrayList<String> getStringValue() { - ArrayList<String> result = new ArrayList<String>(); - for (Widget widget : this.subElements) { - result.add(((ReferenceWidget)((ButtonableObject)widget).getMainObject()).getText()); - } - return result; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - // this class is responsible for the default click behavior of a GdlReference instance protected class ReferenceClickHandler implements ClickHandler { @Override
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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Thu Jul 28 02:20:26 2011 (r686) @@ -12,14 +12,11 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.TextArea; 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.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.base.ButtonableObject; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValueGroup; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; @@ -37,7 +34,7 @@
-public class GdlText extends GdlTextObject implements IGdlHasValue, IGdlHasValueGroup { +public class GdlText extends GdlTextObject implements IGdlHasValueGroup { protected ArrayList<PasswordKeyPressHandler> passwordKeyPressHandler = null; protected ArrayList<HandlerRegistration> passwordKeyPressRegistrations = null; protected Topic valueGroupTopic = null; @@ -584,30 +581,6 @@ } } - // returns the results of all text area elements - @Override - public ArrayList<String> getStringValue() { - ArrayList<String> results = new ArrayList<String>(); - for (Widget item : this.subElements) { - results.add(((TextArea)((ButtonableObject)item).getMainObject()).getValue()); - } - return results; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate(){ - // TODO: implement - return false; - } - // 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/GdlTitle.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Thu Jul 28 02:20:26 2011 (r686) @@ -3,10 +3,7 @@ import java.util.ArrayList; 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.GdlPsis; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.environment.ActiveStyleHandler; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.FocusStyleHandler; @@ -48,7 +45,7 @@ import com.google.gwt.user.client.ui.Widget;
-public class GdlTitle extends GdlTextObject implements IGdlHasValue{ +public class GdlTitle extends GdlTextObject { protected ArrayList<Pair<String, String>> titleActiveCssNamesAndStyles = new ArrayList<Pair<String,String>>(); protected ArrayList<Pair<String, String>> titleFocusCssNamesAndStyles = new ArrayList<Pair<String,String>>(); protected ArrayList<Pair<String, String>> titleHoverCssNamesAndStyles = new ArrayList<Pair<String,String>>(); @@ -426,30 +423,6 @@ } } } - - - @Override - public ArrayList<String> getStringValue() { - ArrayList<String> result = new ArrayList<String>(); - for (Widget title : this.subElements) { - result.add(((TitleWidget)((ButtonableObject)title).getMainObject()).titleElement.getInnerText()); - } - return result; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } // this class represents the acutal content of this widget, i.e.
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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Thu Jul 28 02:20:26 2011 (r686) @@ -18,26 +18,8 @@
@Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // 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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,10 @@ package us.isidor.gdl.anaToMia.Widgets.view;
-import java.util.ArrayList; + 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.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
public class GdlDefaultCreatorTopicView extends GdlDefaultTopicView{ @@ -18,27 +16,6 @@ }
- @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - @Override public TopicMap getContent() { // TODO Auto-generated method stub
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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.view;
-import java.util.ArrayList; 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.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
public class GdlDefaultEditorTopicView extends GdlDefaultTopicView { @@ -16,32 +13,9 @@ // TODO Auto-generated constructor stub }
- - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - 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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,10 @@ package us.isidor.gdl.anaToMia.Widgets.view;
-import java.util.ArrayList; + 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.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
public class GdlEditorAssociationView extends GdlAssociationView { @@ -22,30 +20,10 @@ // TODO Auto-generated method stub return null; } - - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - @Override - public TopicMap getContent() { - // TODO Auto-generated method stub - return null; - }
@Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { + 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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,10 @@ package us.isidor.gdl.anaToMia.Widgets.view;
-import java.util.ArrayList; + 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.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
public class GdlSpecialCreatorTopicView extends GdlSpecialTopicView{ // TODO: implement @@ -18,28 +16,8 @@
@Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - - @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // 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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Thu Jul 28 02:20:26 2011 (r686) @@ -1,12 +1,9 @@ package us.isidor.gdl.anaToMia.Widgets.view;
-import java.util.ArrayList; 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.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -import us.isidor.gdl.anaToMia.Widgets.environment.Pair;
public class GdlSpecialEditorTopicView extends GdlSpecialTopicView{ @@ -18,32 +15,9 @@ // TODO Auto-generated constructor stub }
- - - @Override - public boolean validate() { - // TODO Auto-generated method stub - return false; - } - @Override public TopicMap getContent() { // TODO Auto-generated method stub return null; } - - - - @Override - public ArrayList<String> getStringValue() { - // TODO Auto-generated method stub - return null; - } - - - @Override - public ArrayList<Pair<TopicMapsTypes, Object>> getTmValue() { - // TODO Auto-generated method stub - 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 Thu Jul 28 02:10:24 2011 (r685) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Thu Jul 28 02:20:26 2011 (r686) @@ -11,7 +11,6 @@ import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.IGdlContainer; -import us.isidor.gdl.anaToMia.Widgets.base.IGdlHasValue; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; @@ -19,7 +18,7 @@ import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue;
-public abstract class GdlView extends GdlVisibleObject implements IGdlContainer, IGdlHasValue { +public abstract class GdlView extends GdlVisibleObject implements IGdlContainer { protected GdlView(){ super(); }
-
lgiessmann＠common-lisp.net