Author: lgiessmann Date: Fri Jul 22 05:20:57 2011 New Revision: 661 Log: gdl-frontend: Widgets: changed the gdl spec => gdl:Line-Break => gdl:Space; implment Gdlspace Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java - copied, changed from r653, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlLineBreak.java Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlLineBreak.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/.settings/com.google.gdt.eclipse.core.prefs 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/GdlPsis.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/environment/GdlInstantiator.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/.settings/com.google.gdt.eclipse.core.prefs ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/.settings/com.google.gdt.eclipse.core.prefs Fri Jul 22 04:18:21 2011 (r660) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/.settings/com.google.gdt.eclipse.core.prefs Fri Jul 22 05:20:57 2011 (r661) @@ -1,4 +1,5 @@ -#Mon Jun 20 11:11:41 CEST 2011 -eclipse.preferences.version=1 -warSrcDir=war -warSrcDirIsOutput=true +#Fri Jul 22 13:36:07 CEST 2011 +eclipse.preferences.version=1 +launchConfigExternalUrlPrefix=192.168.0.4 +warSrcDir=war +warSrcDirIsOutput=true 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 Fri Jul 22 04:18:21 2011 (r660) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/TODO.txt Fri Jul 22 05:20:57 2011 (r661) @@ -1,5 +1,8 @@ * fix setting the float property in firefox -* Implement GdlLineBreak => placeholder +* fix the reference widget on ie (no link is opened if it is clicked) + + +* Implement GdlLineBreak => GdlSpace * Implement TopicMaps data consumption * Implement TopicMaps data generation * Implement GdlButton(s) Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Fri Jul 22 04:18:21 2011 (r660) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Fri Jul 22 05:20:57 2011 (r661) @@ -37,7 +37,7 @@ public final static String gdlVisibleObject = gdl + "Visible-Object"; public final static String gdlStyleClass = gdl + "Style-Class"; public final static String gdlDescriptor = gdl + "Descriptor"; - public final static String gdlLineBreak = gdl + "Line-Break"; + public final static String gdlSpace = gdl + "Space"; public final static String gdlInfo = gdl + "Info"; public final static String gdlList = gdl + "List"; public final static String gdlPosition = gdl + "Position"; Copied and modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java (from r653, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlLineBreak.java) ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlLineBreak.java Wed Jul 20 11:21:32 2011 (r653, copy source) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlSpace.java Fri Jul 22 05:20:57 2011 (r661) @@ -4,16 +4,15 @@ import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; -public class GdlLineBreak extends GdlVisibleObject { - // TODO: implement - +public class GdlSpace extends GdlVisibleObject { // some constructors - protected GdlLineBreak() throws InvalidGdlSchemaException, ExecutionException { + protected GdlSpace() throws InvalidGdlSchemaException, ExecutionException { super(); } - public GdlLineBreak(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + public GdlSpace(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); + this.setGdlStyle(this); } } 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 Jul 22 04:18:21 2011 (r660) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Fri Jul 22 05:20:57 2011 (r661) @@ -2,8 +2,6 @@ import java.util.ArrayList; import com.google.gwt.user.client.Element; -import com.google.gwt.user.client.Window; -import com.google.gwt.dom.client.NodeList; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; import com.google.gwt.event.dom.client.FocusEvent; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Fri Jul 22 04:18:21 2011 (r660) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Fri Jul 22 05:20:57 2011 (r661) @@ -4,7 +4,7 @@ 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.Widgets.base.GdlLineBreak; +import us.isidor.gdl.anaToMia.Widgets.base.GdlSpace; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; @@ -41,8 +41,8 @@ // returns a java instance of a GdlVisibleObject that corresponds to the // set topic type of the passed topic instance public static GdlVisibleObject instantiate(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ - if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlLineBreak)){ - return new GdlLineBreak(tmRepresentative); + if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpace)){ + return new GdlSpace(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ return new GdlInfo(tmRepresentative); }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Fri Jul 22 04:18:21 2011 (r660) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Fri Jul 22 05:20:57 2011 (r661) @@ -1,7 +1,6 @@ package us.isidor.gdl.anaToMia.Widgets.text; import com.google.gwt.dom.client.Style.FontStyle; -import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.ui.Widget; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;