isidorus-cvs

Download

isidorus-cvs@common-lisp.net

1037 discussions

[isidorus-cvs] r609 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base environment isidorus view
by lgiessmann＠common-lisp.net 13 Jul '11

13 Jul '11

Author: lgiessmann Date: Wed Jul 13 07:45:55 2011 New Revision: 609 Log: gdl-frontend: Widgets: fixed some methods that instatiate GdlDefaultCreatorTopicView from a Gdl Schema topic map Added: 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/Utils.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/GdlPsis.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/environment/GdlInstantiator.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.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 Wed Jul 13 05:38:00 2011 (r608) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Wed Jul 13 07:45:55 2011 (r609) @@ -37,7 +37,7 @@ // if any value is set in this array list, the requested view is a Default-Creator-Topic-View private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); // if any value is set in this array list, the requested view is a Default-Editor-Topic-View - private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToEdit = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = null; // the GWT base for this panel private AbsolutePanel mainPanel = new AbsolutePanel(); @@ -63,24 +63,24 @@ } - protected GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> topicsToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate) throws ExecutionException{ + protected GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate) throws ExecutionException{ this(); - if(topicsToEdit != null && topicsToEdit.size() != 0)this.requestedTopicsToEdit = topicsToEdit; + if(topicToEdit != null)this.requestedTopicToEdit = topicToEdit; if(topicToCreate != null && topicToCreate.size() != 0)this.requestedTopicsToCreate = topicToCreate; - if(this.requestedTopicsToCreate.size() != 0 && this.requestedTopicsToEdit.size() != 0) - throw new ExecutionException("only one container can be set, i.e. either topics to create or topics to edit"); + if(this.requestedTopicsToCreate.size() != 0 && this.requestedTopicToEdit != null) + throw new ExecutionException("only one container can be set, i.e. either topics to create or a topic to edit"); } - public GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> topicsToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, int width, int height) throws ExecutionException{ - this(topicsToEdit, topicToCreate); + public GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, int width, int height) throws ExecutionException{ + this(topicToEdit, topicToCreate); this.setPixelSize(width, height); } - public GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> topicsToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, String width, String height) throws ExecutionException{ - this(topicsToEdit, topicToCreate); + public GdlPanel(Pair<String, TopicIdentifierTypes> topicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, String width, String height) throws ExecutionException{ + this(topicToEdit, topicToCreate); this.setSize(width, height); } @@ -168,7 +168,7 @@ if(this.loadSchemaCallback == null){ throw new ExecutionException("No LoadSchemaCallback was set yet"); } - this.loadSchemaCallback.loadSchema(this, this.requestedTopicsToEdit, this.requestedTopicsToCreate); + this.loadSchemaCallback.loadSchema(this, this.requestedTopicToEdit, this.requestedTopicsToCreate); }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.LoadError, e); @@ -258,8 +258,10 @@ // Creates the actual view from the requested topic map public void createView(){ try{ - //view = GdlInstantiator.instantiateDefaultEditorOrCreatorView(requestedTopicsTo, requestedTopicToCreat, this.requestedSchemaTm); - //TODO: implement + if(this.requestedTopicsToCreate != null && this.requestedTopicsToCreate.size() != 0) + this.view = GdlInstantiator.instantiateDefaultCreatorTopicView(this.requestedTopicsToCreate, this.requestedSchemaTm); + else if(this.requestedTopicToEdit != null) + this.view = GdlInstantiator.instantiateDefaultEditorTopicView(this.requestedTopicToEdit, this.requestedSchemaTm); mainPanel.add(view); for (Pair<ClickHandler, String> item : this.buttonCallbacks) { view.registerButtonCallback(item.getFirst(), item.getSecond()); 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 Wed Jul 13 05:38:00 2011 (r608) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Wed Jul 13 07:45:55 2011 (r609) @@ -252,247 +252,5 @@ public final static String gdlFocus = gdl + "focus"; public final static String gdlActive = gdl + "active"; } - - - // a helper that returns the topic bound to the identifier via a subject identifier - public static Topic getTopicByPsi(String subjectIdentifier, TopicMap tm){ - if(subjectIdentifier == null || tm == null) return null; - - Locator loc = tm.createLocator(subjectIdentifier); - return tm.getTopicBySubjectIdentifier(loc); - } - - - // a helper that returns the topic bound to the identifier via a subject locator - public static Topic getTopicBySl(String subjectLocator, TopicMap tm){ - if(subjectLocator == null || tm == null) return null; - - Locator loc = tm.createLocator(subjectLocator); - return tm.getTopicBySubjectLocator(loc); - } - - - // a helper that returns the topic bound to the identifier via an item identifier - public static Topic getTopicByIi(String itemIdentifier, TopicMap tm){ - if(itemIdentifier == null || tm == null) return null; - - Locator loc = tm.createLocator(itemIdentifier); - return (Topic)tm.getConstructByItemIdentifier(loc); - } - - - // returns a topic that is identified by ref - public static Topic getTopicByAnyIdentifier(Pair<String, TopicIdentifierTypes> ref, TopicMap tm){ - if(ref.getSecond() == TopicIdentifierTypes.ItemIdentifier){ - return getTopicByIi(ref.getFirst(), tm); - }else if(ref.getSecond() == TopicIdentifierTypes.SubjectLocator){ - return getTopicBySl(ref.getFirst(), tm); - }else { - return getTopicByPsi(ref.getFirst(), tm); - } - } - - - // a helper method to return any identifier string of the topic - public static String getAnyIdOfTopic(Topic topic){ - if(topic.getSubjectIdentifiers().length() != 0){ - return topic.getSubjectIdentifiers().get(0).getReference(); - }else if(topic.getSubjectLocators().length() != 0) { - return topic.getSubjectLocators().get(0).getReference(); - }if(topic.getItemIdentifiers().length() != 0){ - return topic.getItemIdentifiers().get(0).getReference(); - } else { - return null; - } - } - - - // returns all instances of the topic type - public static ArrayList<Topic> getInstanceOf(Topic type, boolean multipleTypesAllowed){ - ArrayList<Topic> result = new ArrayList<Topic>(); - TopicMap tm = type.getTopicMap(); - - for(int i = 0; i != tm.getTopics().length(); ++i){ - if(multipleTypesAllowed){ - if(isInstanceOf(tm.getTopics().get(i), type)) result.add(tm.getTopics().get(i)); - } else { - if(isInstanceOf(tm.getTopics().get(i), type) && tm.getTopics().get(i).getTypes().length() == 1) result.add(tm.getTopics().get(i)); - } - } - - return result; - } - - - // returns true if the topic instance if an instance of the topic type - public static boolean isInstanceOf(Topic instance, Topic type){ - if(instance == null || type == null) return false; - JsArray<Topic> types = instance.getTypes(); - for(int i = 0; i != types.length(); ++i){ - ArrayList<Topic> superTypes = getAllSuperTypes(types.get(i), null); - superTypes.add(types.get(i)); - if(superTypes.contains(type)) return true; - } - - return false; - } - - - // returns an array list with all direct and indirect supertypes of top - public static ArrayList<Topic> getAllSuperTypes(Topic top, ArrayList<Topic> collectedSupertypes){ - if(top == null) return new ArrayList<Topic>(); - - ArrayList<Topic> localCollectedSuperTypes = new ArrayList<Topic>(); - if(collectedSupertypes != null) localCollectedSuperTypes = collectedSupertypes; - - ArrayList<Topic> direcSupertypes = getDirectSuperTypes(top); - for (Topic topic : localCollectedSuperTypes) direcSupertypes.remove(topic); //avoid duplicates - for (Topic topic : direcSupertypes)localCollectedSuperTypes.add(topic); - - for (Topic topic : direcSupertypes){ - ArrayList<Topic> tmp = getAllSuperTypes(topic, localCollectedSuperTypes); - for (Topic tmpTopic : tmp) localCollectedSuperTypes.add(tmpTopic); - } - return localCollectedSuperTypes; - } - - - // returns the direct supertypes of the passed topic - public static ArrayList<Topic> getDirectSuperTypes(Topic top){ - ArrayList<Topic> result = new ArrayList<Topic>(); - if(top == null) return result; - TopicMap tm = top.getTopicMap(); - Topic subtype = getTopicByPsi(TMDM.subtype, tm); - Topic supertype = getTopicByPsi(TMDM.supertype, tm); - Topic supertypeSubtype = getTopicByPsi(TMDM.supertypeSubtype, tm); - - if(subtype == null || supertype == null || supertypeSubtype == null) return result; - - JsArray<Role> validRoles = top.getRolesPlayed(subtype, supertypeSubtype); - for(int i = 0; i != validRoles.length(); ++i){ - Association parent = validRoles.get(i).getParent(); - if(parent.getRoles().length() == 2 && parent.getRoles(supertype).length() == 1)result.add(parent.getRoles(supertypeSubtype).get(0).getPlayer()); - } - return result; - } - - - // returns true if a corresponding association exists - public static boolean hasAssociation(Topic thisTopic, Topic thisRoleType, Topic assocType, Topic otherPlayer, Topic otherRoleType){ - if(thisTopic == null || thisRoleType == null || assocType == null || otherPlayer == null || otherRoleType == null) return false; - - JsArray<Role> roles = thisTopic.getRolesPlayed(thisRoleType, assocType); - for(int i = 0; i != roles.length(); ++i){ - Association parent = roles.get(i).getParent(); - JsArray<Role> otherRoles = parent.getRoles(otherRoleType); - for(int j = 0; j != otherRoles.length(); ++j) - if(otherRoles.get(j).getPlayer().equals(otherPlayer)) return true; - } - - return false; - } - - - // returns the other player of an association with two roles and the correct values - public static ArrayList<Topic> getOtherPlayerOfBinaryAssociation(Topic thisTopic, Topic thisRoleType, Topic assocType, ArrayList<Topic> scope, Topic otherRoleType){ - ArrayList<Topic> result = new ArrayList<Topic>(); - if(thisTopic == null || thisRoleType == null || assocType == null || otherRoleType == null) return result; - - JsArray<Role> roles = thisTopic.getRolesPlayed(thisRoleType, assocType); - for(int i = 0; i != roles.length(); ++i){ - Association parent = roles.get(i).getParent(); - if(parent.getRoles().length() != 2) return result; - if(thisRoleType.equals(otherRoleType) && parent.getRoles(thisTopic).length() == 2){ - if(parent.getRoles(thisRoleType).get(0).getPlayer().equals(thisTopic)) result.add(parent.getRoles(thisRoleType).get(1).getPlayer()); - else result.add(parent.getRoles(thisRoleType).get(0).getPlayer()); - }else if(parent.getRoles(otherRoleType).length() == 1){ - result.add(parent.getRoles(otherRoleType).get(0).getPlayer()); - } - } - return result; - } - - - // returns true if the instance topic is an instance of the topic bound to typeSubectIdentifier - public static boolean isInstanceOf(Topic instance, String typeSubjectIdentifier){ - TopicMap tm = instance.getTopicMap(); - Topic type = tm.getTopicBySubjectIdentifier(tm.createLocator(typeSubjectIdentifier)); - return isInstanceOf(instance, type); - } - - - // returns true if the passed association has exactly the corresponding roles to - // the array list rolePlayersAndTypes - public static boolean hasRoles(Association assoc, ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes){ - if(assoc == null) return false; - if(assoc.getRoles().length() == 0 && rolePlayertypesAndTypes == null) return true; - if(assoc.getRoles().length() != rolePlayertypesAndTypes.size()) return false; - - for (Pair<Topic, Topic> pair : rolePlayertypesAndTypes) { - JsArray<Role> selection = assoc.getRoles(pair.getSecond()); - int i = 0; - for(; i != selection.length(); ++i){ - if(isInstanceOf(selection.get(i).getPlayer(), pair.getFirst())) break; - } - - if(i == selection.length()) return false; - } - - return true; - } - - - // returns true if the topics of themes are all equal to the scope of construct - public static boolean hasThemes(Construct construct, ArrayList<Topic> themes){ - if(construct == null) return false; - - ScopedStub scoped = (ScopedStub)construct; - if(scoped.getScope().length() != 0 && (themes == null || themes.size() == 0)) return false; - if(scoped.getScope().length() != themes.size()) return false; - - for(int i = 0; i != scoped.getScope().length(); ++i){ - if(!themes.contains(scoped.getScope().get(i))) return false; - } - - return true; - } - - - // returns all topics that are instances if tm-value, which are also bound to this - // topic via a gdl:tm-binding association - public static ArrayList<Topic> getTmValues(Topic top){ - ArrayList<Topic> result = new ArrayList<Topic>(); - if(top == null) return result; - TopicMap tm = top.getTopicMap(); - Topic descriptor = getTopicByPsi(RoleType.gdlDescriptor, tm); - Topic tmBinding = getTopicByPsi(AssociationType.gdlTmBinding, tm); - Topic tmValue = getTopicByPsi(TopicType.gdlTmValue, tm); - - JsArray<Role> roles = top.getRolesPlayed(descriptor, tmBinding); - for(int i = 0; i != roles.length(); ++i){ - Association parent = roles.get(i).getParent(); - if(parent.getRoles().length() == 2 && parent.getRoles(descriptor).length() == 1 && - isInstanceOf(parent.getRoles(descriptor).get(0).getPlayer(), tmValue)) - result.add(parent.getRoles(descriptor).get(0).getPlayer()); - } - return result; - } - - - // returns the associations that are bound to the topic "topic" and have the passed scope and roles - public static ArrayList<Association> getAssociationsOfTopic(Topic topic, Topic roleType, Topic assocType, ArrayList<Topic> scope, ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes){ - ArrayList<Association> result = new ArrayList<Association>(); - if(topic == null || assocType == null || rolePlayertypesAndTypes == null || rolePlayertypesAndTypes.size() == 0) return result; - - ArrayList<Association> allPotentialAssocs = new ArrayList<Association>(); - for(int i = 0; i != topic.getRolesPlayed(roleType, assocType).length(); ++i) allPotentialAssocs.add(topic.getRolesPlayed(roleType, assocType).get(i).getParent()); - - ArrayList<Association> assocsWoScope = new ArrayList<Association>(); - for (Association assoc : allPotentialAssocs) if(hasRoles(assoc, rolePlayertypesAndTypes)) assocsWoScope.add(assoc); - - for (Association assoc : assocsWoScope) if(hasThemes(assoc, scope)) result.add(assoc); - - return result; - } } 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 Wed Jul 13 05:38:00 2011 (r608) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Wed Jul 13 07:45:55 2011 (r609) @@ -142,7 +142,7 @@ } if(unscopedOccs.size() > 1){ - throw new InvalidGdlSchemaException("The topic " + GdlPsis.getAnyIdOfTopic(this.tmRepresentative) + " must be bound to none or one unscoped occurrence of the type " + occurrenceType + ", but is bound " + unscopedOccs.size() + " times to it"); + throw new InvalidGdlSchemaException("The topic " + TmHelper.getAnyIdOfTopic(this.tmRepresentative) + " must be bound to none or one unscoped occurrence of the type " + occurrenceType + ", but is bound " + unscopedOccs.size() + " times to it"); } else if(unscopedOccs.size() == 1){ return unscopedOccs.get(0); } else { @@ -170,7 +170,7 @@ } if(matchedOccurrences.size() > 1){ - throw new InvalidGdlSchemaException("The topic " + GdlPsis.getAnyIdOfTopic(this.tmRepresentative) + "must be bound to none or one occurrence of the type " + occurrenceType + " and the scope " + theme + " but is bound " + matchedOccurrences.size() + " times to it"); + throw new InvalidGdlSchemaException("The topic " + TmHelper.getAnyIdOfTopic(this.tmRepresentative) + "must be bound to none or one occurrence of the type " + occurrenceType + " and the scope " + theme + " but is bound " + matchedOccurrences.size() + " times to it"); } else if(matchedOccurrences.size() == 1){ return matchedOccurrences.get(0); } else { @@ -184,7 +184,7 @@ public String getId() throws InvalidGdlSchemaException { JsArray<Occurrence> idOccs = getOccurrences(GdlPsis.OccurrenceType.gdlId); if(idOccs.length() != 1){ - throw new InvalidGdlSchemaException("The topic " + GdlPsis.getAnyIdOfTopic(this.tmRepresentative) + " must be bound to exactly one occurrence of the type " + GdlPsis.OccurrenceType.gdlId + ", but is bound " + idOccs.length() + " times to it"); + throw new InvalidGdlSchemaException("The topic " + TmHelper.getAnyIdOfTopic(this.tmRepresentative) + " must be bound to exactly one occurrence of the type " + GdlPsis.OccurrenceType.gdlId + ", but is bound " + idOccs.length() + " times to it"); } else { return idOccs.get(0).getValue(); } Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TmHelper.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/TmHelper.java Wed Jul 13 07:45:55 2011 (r609) @@ -0,0 +1,265 @@ +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.Locator; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.ScopedStub; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.AssociationType; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.RoleType; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.TMDM; +import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis.TopicType; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; + +import com.google.gwt.core.client.JsArray; + +public class TmHelper { + + + // a helper that returns the topic bound to the identifier via a subject identifier + public static Topic getTopicByPsi(String subjectIdentifier, TopicMap tm){ + if(subjectIdentifier == null || tm == null) return null; + + Locator loc = tm.createLocator(subjectIdentifier); + return tm.getTopicBySubjectIdentifier(loc); + } + + + // a helper that returns the topic bound to the identifier via a subject locator + public static Topic getTopicBySl(String subjectLocator, TopicMap tm){ + if(subjectLocator == null || tm == null) return null; + + Locator loc = tm.createLocator(subjectLocator); + return tm.getTopicBySubjectLocator(loc); + } + + + // a helper that returns the topic bound to the identifier via an item identifier + public static Topic getTopicByIi(String itemIdentifier, TopicMap tm){ + if(itemIdentifier == null || tm == null) return null; + + Locator loc = tm.createLocator(itemIdentifier); + return (Topic)tm.getConstructByItemIdentifier(loc); + } + + + // returns a topic that is identified by ref + public static Topic getTopicByAnyIdentifier(Pair<String, TopicIdentifierTypes> ref, TopicMap tm){ + if(ref.getSecond() == TopicIdentifierTypes.ItemIdentifier){ + return getTopicByIi(ref.getFirst(), tm); + }else if(ref.getSecond() == TopicIdentifierTypes.SubjectLocator){ + return getTopicBySl(ref.getFirst(), tm); + }else { + return getTopicByPsi(ref.getFirst(), tm); + } + } + + + // a helper method to return any identifier string of the topic + public static String getAnyIdOfTopic(Topic topic){ + if(topic.getSubjectIdentifiers().length() != 0){ + return topic.getSubjectIdentifiers().get(0).getReference(); + }else if(topic.getSubjectLocators().length() != 0) { + return topic.getSubjectLocators().get(0).getReference(); + }if(topic.getItemIdentifiers().length() != 0){ + return topic.getItemIdentifiers().get(0).getReference(); + } else { + return null; + } + } + + + // returns all instances of the topic type + public static ArrayList<Topic> getInstanceOf(Topic type, boolean multipleTypesAllowed){ + ArrayList<Topic> result = new ArrayList<Topic>(); + TopicMap tm = type.getTopicMap(); + + for(int i = 0; i != tm.getTopics().length(); ++i){ + if(multipleTypesAllowed){ + if(isInstanceOf(tm.getTopics().get(i), type)) result.add(tm.getTopics().get(i)); + } else { + if(isInstanceOf(tm.getTopics().get(i), type) && tm.getTopics().get(i).getTypes().length() == 1) result.add(tm.getTopics().get(i)); + } + } + + return result; + } + + + // returns true if the topic instance if an instance of the topic type + public static boolean isInstanceOf(Topic instance, Topic type){ + if(instance == null || type == null) return false; + + JsArray<Topic> types = instance.getTypes(); + for(int i = 0; i != types.length(); ++i){ + ArrayList<Topic> superTypes = getAllSuperTypes(types.get(i), null); + superTypes.add(types.get(i)); + if(superTypes.contains(type)) return true; + } + + return false; + } + + + // returns an array list with all direct and indirect supertypes of top + public static ArrayList<Topic> getAllSuperTypes(Topic top, ArrayList<Topic> collectedSupertypes){ + if(top == null) return new ArrayList<Topic>(); + + ArrayList<Topic> localCollectedSuperTypes = new ArrayList<Topic>(); + if(collectedSupertypes != null) localCollectedSuperTypes = collectedSupertypes; + + ArrayList<Topic> direcSupertypes = getDirectSuperTypes(top); + for (Topic topic : localCollectedSuperTypes) direcSupertypes.remove(topic); //avoid duplicates + for (Topic topic : direcSupertypes)localCollectedSuperTypes.add(topic); + + for (Topic topic : direcSupertypes){ + ArrayList<Topic> tmp = getAllSuperTypes(topic, localCollectedSuperTypes); + for (Topic tmpTopic : tmp) localCollectedSuperTypes.add(tmpTopic); + } + return localCollectedSuperTypes; + } + + + // returns the direct supertypes of the passed topic + public static ArrayList<Topic> getDirectSuperTypes(Topic top){ + ArrayList<Topic> result = new ArrayList<Topic>(); + if(top == null) return result; + TopicMap tm = top.getTopicMap(); + Topic subtype = getTopicByPsi(TMDM.subtype, tm); + Topic supertype = getTopicByPsi(TMDM.supertype, tm); + Topic supertypeSubtype = getTopicByPsi(TMDM.supertypeSubtype, tm); + + if(subtype == null || supertype == null || supertypeSubtype == null) return result; + + JsArray<Role> validRoles = top.getRolesPlayed(subtype, supertypeSubtype); + for(int i = 0; i != validRoles.length(); ++i){ + Association parent = validRoles.get(i).getParent(); + if(parent.getRoles().length() == 2 && parent.getRoles(supertype).length() == 1)result.add(parent.getRoles(supertypeSubtype).get(0).getPlayer()); + } + return result; + } + + + // returns true if a corresponding association exists + public static boolean hasAssociation(Topic thisTopic, Topic thisRoleType, Topic assocType, Topic otherPlayer, Topic otherRoleType){ + if(thisTopic == null || thisRoleType == null || assocType == null || otherPlayer == null || otherRoleType == null) return false; + + JsArray<Role> roles = thisTopic.getRolesPlayed(thisRoleType, assocType); + for(int i = 0; i != roles.length(); ++i){ + Association parent = roles.get(i).getParent(); + JsArray<Role> otherRoles = parent.getRoles(otherRoleType); + for(int j = 0; j != otherRoles.length(); ++j) + if(otherRoles.get(j).getPlayer().equals(otherPlayer)) return true; + } + + return false; + } + + + // returns the other player of an association with two roles and the correct values + public static ArrayList<Topic> getOtherPlayerOfBinaryAssociation(Topic thisTopic, Topic thisRoleType, Topic assocType, ArrayList<Topic> scope, Topic otherRoleType){ + ArrayList<Topic> result = new ArrayList<Topic>(); + if(thisTopic == null || thisRoleType == null || assocType == null || otherRoleType == null) return result; + + JsArray<Role> roles = thisTopic.getRolesPlayed(thisRoleType, assocType); + for(int i = 0; i != roles.length(); ++i){ + Association parent = roles.get(i).getParent(); + if(parent.getRoles().length() != 2) return result; + if(thisRoleType.equals(otherRoleType) && parent.getRoles(thisTopic).length() == 2){ + if(parent.getRoles(thisRoleType).get(0).getPlayer().equals(thisTopic)) result.add(parent.getRoles(thisRoleType).get(1).getPlayer()); + else result.add(parent.getRoles(thisRoleType).get(0).getPlayer()); + }else if(parent.getRoles(otherRoleType).length() == 1){ + result.add(parent.getRoles(otherRoleType).get(0).getPlayer()); + } + } + return result; + } + + + // returns true if the instance topic is an instance of the topic bound to typeSubectIdentifier + public static boolean isInstanceOf(Topic instance, String typeSubjectIdentifier){ + TopicMap tm = instance.getTopicMap(); + Topic type = tm.getTopicBySubjectIdentifier(tm.createLocator(typeSubjectIdentifier)); + return isInstanceOf(instance, type); + } + + + // returns true if the passed association has exactly the corresponding roles to + // the array list rolePlayersAndTypes + public static boolean hasRoles(Association assoc, ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes){ + if(assoc == null) return false; + if(assoc.getRoles().length() == 0 && rolePlayertypesAndTypes == null) return true; + if(assoc.getRoles().length() != rolePlayertypesAndTypes.size()) return false; + + for (Pair<Topic, Topic> pair : rolePlayertypesAndTypes) { + JsArray<Role> selection = assoc.getRoles(pair.getSecond()); + int i = 0; + for(; i != selection.length(); ++i){ + if(isInstanceOf(selection.get(i).getPlayer(), pair.getFirst())) break; + } + + if(i == selection.length()) return false; + } + + return true; + } + + + // returns true if the topics of themes are all equal to the scope of construct + public static boolean hasThemes(Construct construct, ArrayList<Topic> themes){ + if(construct == null) return false; + + ScopedStub scoped = (ScopedStub)construct; + if(scoped.getScope().length() != 0 && (themes == null || themes.size() == 0)) return false; + if(scoped.getScope().length() != themes.size()) return false; + + for(int i = 0; i != scoped.getScope().length(); ++i){ + if(!themes.contains(scoped.getScope().get(i))) return false; + } + + return true; + } + + + // returns all topics that are instances if tm-value, which are also bound to this + // topic via a gdl:tm-binding association + public static ArrayList<Topic> getTmValues(Topic top){ + ArrayList<Topic> result = new ArrayList<Topic>(); + if(top == null) return result; + TopicMap tm = top.getTopicMap(); + Topic descriptor = getTopicByPsi(RoleType.gdlDescriptor, tm); + Topic tmBinding = getTopicByPsi(AssociationType.gdlTmBinding, tm); + Topic tmValue = getTopicByPsi(TopicType.gdlTmValue, tm); + + JsArray<Role> roles = top.getRolesPlayed(descriptor, tmBinding); + for(int i = 0; i != roles.length(); ++i){ + Association parent = roles.get(i).getParent(); + if(parent.getRoles().length() == 2 && parent.getRoles(descriptor).length() == 1 && + isInstanceOf(parent.getRoles(descriptor).get(0).getPlayer(), tmValue)) + result.add(parent.getRoles(descriptor).get(0).getPlayer()); + } + return result; + } + + + // returns the associations that are bound to the topic "topic" and have the passed scope and roles + public static ArrayList<Association> getAssociationsOfTopic(Topic topic, Topic roleType, Topic assocType, ArrayList<Topic> scope, ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes){ + ArrayList<Association> result = new ArrayList<Association>(); + if(topic == null || assocType == null || rolePlayertypesAndTypes == null || rolePlayertypesAndTypes.size() == 0) return result; + + ArrayList<Association> allPotentialAssocs = new ArrayList<Association>(); + for(int i = 0; i != topic.getRolesPlayed(roleType, assocType).length(); ++i) allPotentialAssocs.add(topic.getRolesPlayed(roleType, assocType).get(i).getParent()); + + ArrayList<Association> assocsWoScope = new ArrayList<Association>(); + for (Association assoc : allPotentialAssocs) if(hasRoles(assoc, rolePlayertypesAndTypes)) assocsWoScope.add(assoc); + + for (Association assoc : assocsWoScope) if(hasThemes(assoc, scope)) result.add(assoc); + + return result; + } +} Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/Utils.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/Utils.java Wed Jul 13 07:45:55 2011 (r609) @@ -0,0 +1,20 @@ +package us.isidor.gdl.anaToMia.Widgets.base; + +import java.util.ArrayList; + +public class Utils { + + // returns true if both arrays have the same items + public static <T> boolean compareLists(ArrayList<T> lft, ArrayList<T> rgt){ + if(lft == null && rgt == null) return true; + if(lft == null || rgt == null) return false; + if(lft.size() != rgt.size()) return false; + + for(Object obj : lft) if(!rgt.contains(obj))return false; + + // because of duplicate values the reverse comparison must also be done + for(Object obj : rgt) if(!lft.contains(obj))return false; + + return true; + } +} 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 Wed Jul 13 05:38:00 2011 (r608) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Wed Jul 13 07:45:55 2011 (r609) @@ -7,6 +7,8 @@ import us.isidor.gdl.anaToMia.Widgets.base.GdlLineBreak; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; +import us.isidor.gdl.anaToMia.Widgets.base.TmHelper; +import us.isidor.gdl.anaToMia.Widgets.base.Utils; import us.isidor.gdl.anaToMia.Widgets.button.GdlActionButton; import us.isidor.gdl.anaToMia.Widgets.button.GdlCheckBox; import us.isidor.gdl.anaToMia.Widgets.button.GdlCommitButton; @@ -40,74 +42,175 @@ // 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(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlLineBreak)){ + if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlLineBreak)){ return new GdlLineBreak(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ return new GdlInfo(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ return new GdlTitle(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){ return new GdlReference(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlRadioButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlRadioButton)){ return new GdlRadioButton(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCheckBox)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCheckBox)){ return new GdlCheckBox(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlActionButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlActionButton)){ return new GdlActionButton(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlValidateButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlValidateButton)){ return new GdlValidateButton(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreateButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreateButton)){ return new GdlCreateButton(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDeleteButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDeleteButton)){ return new GdlDeleteButton(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCommitButton)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCommitButton)){ return new GdlCommitButton(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlImage)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlImage)){ return new GdlImage(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlVideo)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlVideo)){ return new GdlVideo(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlAudio)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlAudio)){ return new GdlAudio(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDatePicker)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDatePicker)){ return new GdlDatePicker(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTimePicker)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTimePicker)){ return new GdlTimePicker(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDateTimePicker)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDateTimePicker)){ return new GdlDateTimePicker(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlUnit)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlUnit)){ return new GdlUnit(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlText)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlText)){ return new GdlText(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlList)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlList)){ return new GdlList(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlListBox)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlListBox)){ return new GdlListBox(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ return new GdlDefaultCreatorTopicView(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultEditorTopicView)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultEditorTopicView)){ return new GdlDefaultEditorTopicView(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialCreatorTopicView)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialCreatorTopicView)){ return new GdlSpecialCreatorTopicView(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialEditorTopicView)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialEditorTopicView)){ return new GdlSpecialEditorTopicView(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreatorAssociationview)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreatorAssociationview)){ return new GdlCreatorAssociationView(tmRepresentative); - }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlEditorAssociationView)){ + }else if(TmHelper.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlEditorAssociationView)){ return new GdlEditorAssociationView(tmRepresentative); }else{ String values = ""; for(int i = 0; i != tmRepresentative.getTypes().length(); ++i){ if(i != tmRepresentative.getTypes().length() - 1){ - values += GdlPsis.getAnyIdOfTopic(tmRepresentative.getTypes().get(i)) + ", "; + values += TmHelper.getAnyIdOfTopic(tmRepresentative.getTypes().get(i)) + ", "; }else { - values += GdlPsis.getAnyIdOfTopic(tmRepresentative.getTypes().get(i)); + values += TmHelper.getAnyIdOfTopic(tmRepresentative.getTypes().get(i)); } } - throw new InvalidGdlSchemaException("the topic " + GdlPsis.getAnyIdOfTopic(tmRepresentative) + " is an instance of an unsupported visible topic type or an abstract topic type: " + values); + throw new InvalidGdlSchemaException("the topic " + TmHelper.getAnyIdOfTopic(tmRepresentative) + " is an instance of an unsupported visible topic type or an abstract topic type: " + values); } } + + // returns a GdlDefaultCreatorTopicView tha corresponds to the passed arguements + public static GdlDefaultCreatorTopicView instantiateDefaultCreatorTopicView(ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopics, TopicMap schemaTm) throws InvalidGdlSchemaException, ExecutionException{ + ArrayList<Topic> views = getViewTopics(requestedTopics, TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlDefaultCreatorTopicView, schemaTm), schemaTm); + + if(views.size() != 1){ + String values = ""; + for (Pair<String, TopicIdentifierTypes> pair : requestedTopics) + values += ", " + pair.getFirst(); + values = values.substring(2); + String bindings = ""; + for (Topic top : views) + bindings += ", " + TmHelper.getAnyIdOfTopic(top); + bindings = bindings.substring(2); + throw new InvalidGdlSchemaException("the combination fo topics requested (" + values + ") must be bound exactly once to a " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " but is bound to " + bindings); + } + + return new GdlDefaultCreatorTopicView(views.get(0)); + } + + + // returns the topics that are bound to the corresponding user topics and corresponds to the + // given view super type. Note only topics that are bound to TM-Single-Type-Value and + // TM-Multiple-Type-Value are taken into account. + public static ArrayList<Topic> getViewTopics(ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopics, Topic viewSupertype, TopicMap schemaTm) throws InvalidGdlSchemaException{ + if(requestedTopics == null || requestedTopics.size() == 0 || schemaTm == null) return null; + + // request all topics that are passed by the user + ArrayList<Topic> requestedTops = new ArrayList<Topic>(); + for (Pair<String, TopicIdentifierTypes> topId : requestedTopics){ + Topic top = TmHelper.getTopicByAnyIdentifier(topId, schemaTm); + if(top == null) throw new InvalidGdlSchemaException("the topic " + topId.getFirst() + " was not found!"); + if(!requestedTops.contains(top)) requestedTops.add(top); + } + + // get all TM-Values, i.e. TM-Multiple-Type-Value and TM-Single-Type-Value (only if requstedTops.sie() == 1) + ArrayList<Topic> tmValues = new ArrayList<Topic>(); + Topic tmConstruct = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlTmConstruct, schemaTm); + Topic tmBinding = TmHelper.getTopicByPsi(GdlPsis.AssociationType.gdlTmBinding, schemaTm); + Topic descriptor = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, schemaTm); + Topic tmMultipleTypeValue = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlTmMultipleTypeValue, schemaTm); + Topic tmSingleTypeValue = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlTmSingleTypeValue, schemaTm); + for (Topic requestedTopic : requestedTops) { + ArrayList<Topic> allTmValues = TmHelper.getOtherPlayerOfBinaryAssociation(requestedTopic, tmConstruct, tmBinding, null, descriptor); + // filter only the valid tm-values for this scenario + for (Topic tmValue : allTmValues){ + if(TmHelper.isInstanceOf(tmValue, tmMultipleTypeValue) || (requestedTops.size() == 1 && TmHelper.isInstanceOf(tmValue, tmSingleTypeValue))){ + // check all user topics that are associated with the tmValue, i.e. a tmValue is only valid + // if exactly those topics are associated to it through a tm-binding association, which are + // requested by the user + ArrayList<Topic> allInstanceValues = TmHelper.getOtherPlayerOfBinaryAssociation(tmValue, descriptor, tmBinding, null, tmConstruct); + if(Utils.compareLists(allInstanceValues, requestedTops) && !tmValues.contains(tmValue)) tmValues.add(tmValue); + } + } + } + + // get all views that are bound to the found tm-values + ArrayList<Topic> views = new ArrayList<Topic>(); + Topic tmValueRoleType = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlTmValue, schemaTm); + Topic topicViewBinding = TmHelper.getTopicByPsi(GdlPsis.AssociationType.gdlTopicViewBinding, schemaTm); + for (Topic tmValue : tmValues) { + ArrayList<Topic> allViews = TmHelper.getOtherPlayerOfBinaryAssociation(tmValue, tmValueRoleType, topicViewBinding, null, descriptor); + // filter for allViews + if(viewSupertype == null){ + for (Topic view : allViews) + if(!views.contains(view))views.add(view); + } else { + for (Topic view : allViews) + if(!views.contains(view) && TmHelper.isInstanceOf(view, viewSupertype)) views.add(view); + } + } + + return views; + } + + + + public static GdlDefaultEditorTopicView instantiateDefaultEditorTopicView(Pair<String, TopicIdentifierTypes> requestedTopic, TopicMap schemaTm){ + if(requestedTopic == null || schemaTm == null) return null; + + + // TODO: search for a direct TM-Instance-Value binding if no one is found, search the types and call GdlDefaultCreatorTopicView + + // 1. get the requested topic + // 2. get types of requested topic + // 3. get tm-values that are assiciated with exalty those topics that are requested => assert the tm-value type + // 4. search for a tm-instance-value binding + // 5. search the a default-creator-topic-view bound to the found tm-values + // 6. return the view or throw an error if no view or more than one view was found + + // TODO: implement + return null; + } + + + + + + + + // returns a DefaultTopicView instance that represents the entry point of this topic map for one of // instanceTopic of typeTopics, i.e. one of the must be null or empty public static GdlDefaultTopicView instantiateDefaultEditorOrCreatorView(Pair<String, TopicIdentifierTypes> instanceTopic, ArrayList<Pair<String, TopicIdentifierTypes>> typeTopics, TopicMap tm) throws InvalidGdlSchemaException, ExecutionException{ @@ -118,43 +221,43 @@ throw new ExecutionException("only one of topic is allowed to be set as the base topic for a " + GdlPsis.TopicType.gdlView + " but found: " + values); } - Topic defaultCreatorTopicView = GdlPsis.getTopicByPsi(GdlPsis.TopicType.gdlDefaultCreatorTopicView, tm); - Topic defaultEditorTopicView = GdlPsis.getTopicByPsi(GdlPsis.TopicType.gdlDefaultEditorTopicView, tm); + Topic defaultCreatorTopicView = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlDefaultCreatorTopicView, tm); + Topic defaultEditorTopicView = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlDefaultEditorTopicView, tm); if(defaultCreatorTopicView == null && defaultEditorTopicView == null){ throw new InvalidGdlSchemaException("the requested GDL schema does not have an entry point defined, either an instance of " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " or " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " is necessary"); }else { // all topics (types) that have to be displayed by a view ArrayList<Topic> topsToDisplay = new ArrayList<Topic>(); if(instanceTopic != null){ - topsToDisplay.add(GdlPsis.getTopicByAnyIdentifier(instanceTopic, tm)); + topsToDisplay.add(TmHelper.getTopicByAnyIdentifier(instanceTopic, tm)); }else{ for (Pair<String, TopicIdentifierTypes> pair : typeTopics) { - topsToDisplay.add(GdlPsis.getTopicByAnyIdentifier(pair, tm)); + topsToDisplay.add(TmHelper.getTopicByAnyIdentifier(pair, tm)); } } // get the TM-Value instance that is bound to the topic (type) and the view instance ArrayList<Topic> tmValues = new ArrayList<Topic>(); - Topic descriptor = GdlPsis.getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); - Topic tmBinding = GdlPsis.getTopicByPsi(GdlPsis.AssociationType.gdlTmBinding, tm); - Topic tmValue = GdlPsis.getTopicByPsi(GdlPsis.RoleType.gdlTmValue, tm); - Topic TmValue = GdlPsis.getTopicByPsi(GdlPsis.TopicType.gdlTmValue, tm); - Topic tmConstruct = GdlPsis.getTopicByPsi(GdlPsis.RoleType.gdlTmConstruct, tm); + Topic descriptor = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); + Topic tmBinding = TmHelper.getTopicByPsi(GdlPsis.AssociationType.gdlTmBinding, tm); + Topic tmValue = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlTmValue, tm); + Topic TmValue = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlTmValue, tm); + Topic tmConstruct = TmHelper.getTopicByPsi(GdlPsis.RoleType.gdlTmConstruct, tm); for (Topic topic : topsToDisplay) { - ArrayList<Topic> potentialTmValues = GdlPsis.getOtherPlayerOfBinaryAssociation(topic, tmConstruct, tmBinding, null, descriptor); + ArrayList<Topic> potentialTmValues = TmHelper.getOtherPlayerOfBinaryAssociation(topic, tmConstruct, tmBinding, null, descriptor); for (Topic potentialTmValue : potentialTmValues) - if(GdlPsis.isInstanceOf(potentialTmValue, TmValue)) tmValues.add(potentialTmValue); + if(TmHelper.isInstanceOf(potentialTmValue, TmValue)) tmValues.add(potentialTmValue); } // get only the tm-value that binds all topics to be displayed to the current view ArrayList<Topic> invalidTmValues = new ArrayList<Topic>(); - Topic topictype = GdlPsis.getTopicByPsi(GdlPsis.TMCL.topictype, tm); + Topic topictype = TmHelper.getTopicByPsi(GdlPsis.TMCL.topictype, tm); for (Topic value : tmValues) { for (Topic topToDisplay : topsToDisplay) { ArrayList<Pair<Topic, Topic>> roles = new ArrayList<Pair<Topic,Topic>>(); roles.add(new Pair<Topic, Topic>(topictype, tmConstruct)); - if(GdlPsis.hasAssociation(topToDisplay, tmConstruct, tmBinding, value, descriptor) || - GdlPsis.getAssociationsOfTopic(value, descriptor, tmBinding, null, roles).size() != topsToDisplay.size()){ + if(TmHelper.hasAssociation(topToDisplay, tmConstruct, tmBinding, value, descriptor) || + TmHelper.getAssociationsOfTopic(value, descriptor, tmBinding, null, roles).size() != topsToDisplay.size()){ invalidTmValues.add(value); } } @@ -164,17 +267,17 @@ // get all default topic views that are bound to the existent tm-values ArrayList<Topic> defaultTopicViews = new ArrayList<Topic>(); - Topic defaultTopicView = GdlPsis.getTopicByPsi(GdlPsis.TopicType.gdlDefaultTopicView, tm); - Topic topicViewBinding = GdlPsis.getTopicByPsi(GdlPsis.AssociationType.gdlTopicViewBinding, tm); + Topic defaultTopicView = TmHelper.getTopicByPsi(GdlPsis.TopicType.gdlDefaultTopicView, tm); + Topic topicViewBinding = TmHelper.getTopicByPsi(GdlPsis.AssociationType.gdlTopicViewBinding, tm); for (Topic validTmValue : tmValues) { - ArrayList<Topic> views = GdlPsis.getOtherPlayerOfBinaryAssociation(validTmValue, tmValue, topicViewBinding, null, descriptor); - for (Topic view : views) if(GdlPsis.isInstanceOf(view, defaultTopicView)) defaultTopicViews.add(view); + ArrayList<Topic> views = TmHelper.getOtherPlayerOfBinaryAssociation(validTmValue, tmValue, topicViewBinding, null, descriptor); + for (Topic view : views) if(TmHelper.isInstanceOf(view, defaultTopicView)) defaultTopicViews.add(view); } // return default-topic-view if(defaultTopicViews.size() > 2){ String values = ""; - for (Topic topic : topsToDisplay)values += ", " + GdlPsis.getAnyIdOfTopic(topic); + for (Topic topic : topsToDisplay)values += ", " + TmHelper.getAnyIdOfTopic(topic); if(values.length() >= 2) values = values.substring(2); throw new InvalidGdlSchemaException("only one default editor or creator topic view can be bound to a topic, but found " + values); } else if(defaultTopicViews.size() == 1){ @@ -182,7 +285,7 @@ } else if(defaultTopicViews.size() == 2){ // one creator and one editor view Topic creatorView = null; Topic editorView = null; - if(GdlPsis.isInstanceOf(defaultTopicViews.get(0), GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ + if(TmHelper.isInstanceOf(defaultTopicViews.get(0), GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ creatorView = defaultTopicViews.get(0); editorView = defaultTopicViews.get(1); }else { Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java Wed Jul 13 05:38:00 2011 (r608) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java Wed Jul 13 07:45:55 2011 (r609) @@ -6,5 +6,5 @@ import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; public interface ILoadSchemaCallback { - public void loadSchema(GdlPanel panel, ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate)throws RequestException; + public void loadSchema(GdlPanel panel, Pair<String, TopicIdentifierTypes> requestedTopicToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate)throws RequestException; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Wed Jul 13 05:38:00 2011 (r608) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Wed Jul 13 07:45:55 2011 (r609) @@ -25,7 +25,7 @@ public class LoadSchemaCallback implements ILoadSchemaCallback{ private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "test.gdl.jtm"); // TODO: replace with the correct URL private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); - private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToEdit = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + private Pair<String, TopicIdentifierTypes> requestedTopicToEdit = null; private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, isidorusUrl); @@ -34,9 +34,9 @@ // this method is invoked as a callback method @Override - public void loadSchema(GdlPanel panel, ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToEdit , ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate)throws RequestException { + public void loadSchema(GdlPanel panel, Pair<String, TopicIdentifierTypes> requestedTopicToEdit , ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate)throws RequestException { this.requestedTopicsToCreate = requestedTopicsToCreate; - this.requestedTopicsToEdit = requestedTopicsToEdit; + this.requestedTopicToEdit = requestedTopicToEdit; requestBuilder.sendRequest(null, new RequestCallbackImpl(panel)); } @@ -75,7 +75,7 @@ public void onClick(ClickEvent event) { dialog.hide(); try{ - loadSchema(panel, LoadSchemaCallback.this.requestedTopicsToEdit, LoadSchemaCallback.this.requestedTopicsToCreate); + loadSchema(panel, LoadSchemaCallback.this.requestedTopicToEdit, LoadSchemaCallback.this.requestedTopicsToCreate); }catch(Exception e){ Window.alert("connection to : " + isidorusUrl + " failed: " + e.getMessage()); } @@ -102,7 +102,7 @@ public void onClick(ClickEvent event) { dialog.hide(); try{ - loadSchema(panel, LoadSchemaCallback.this.requestedTopicsToEdit, LoadSchemaCallback.this.requestedTopicsToCreate); + loadSchema(panel, LoadSchemaCallback.this.requestedTopicToEdit, LoadSchemaCallback.this.requestedTopicsToCreate); }catch(Exception e){ Window.alert("connection to : " + isidorusUrl + " failed: " + e.getMessage()); } 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 Wed Jul 13 05:38:00 2011 (r608) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Wed Jul 13 07:45:55 2011 (r609) @@ -14,6 +14,7 @@ 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.InvalidGdlSchemaException; @@ -68,7 +69,7 @@ if(topsWithoutAncestorPosAssoc.size() > 1){ String foundTops = ""; for (Topic topic : topsWithoutAncestorPosAssoc) { - foundTops += GdlPsis.getAnyIdOfTopic(topic) + ", "; + foundTops += TmHelper.getAnyIdOfTopic(topic) + ", "; } if(foundTops.length() >= 2)foundTops = foundTops.substring(0, foundTops.length() - 2); throw new InvalidGdlSchemaException("A " + GdlPsis.TopicType.gdlView + " must have maximal one item that is desiganted to tbe the first item in this view, i.e. there must be zero or one items without being bound to a " + GdlPsis.RoleType.gdlAncestor + " but found: " + foundTops);

1 0

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

13 Jul '11

Author: lgiessmann Date: Wed Jul 13 05:38:00 2011 New Revision: 608 Log: gdl-frontend: Widgets: changed the way the GdlPanel requests topics to edit or to create 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/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm 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 Wed Jul 13 04:57:28 2011 (r607) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Wed Jul 13 05:38:00 2011 (r608) @@ -34,12 +34,10 @@ // The ClickHandlers will be registered on the buttons with the corresponding id attribute. private ArrayList<Pair<ClickHandler, String>> buttonCallbacks = new ArrayList<Pair<ClickHandler, String>>(); - // If requestedTypes is not null or length != 0, the string values must be treated as topic - // identifiers of a topic type. The created GDL view must be a Default-Topic-Creator-View - private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTypes = new ArrayList<Pair<String, TopicIdentifierTypes>>(); - // If requestedInstance is not null or != "", the string value must be treated as a topic identifier - // of a particular topic instance. The created GDL view must be a Default-Topic-Editor-View - private Pair<String, TopicIdentifierTypes> requestedInstance = null; + // if any value is set in this array list, the requested view is a Default-Creator-Topic-View + private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + // if any value is set in this array list, the requested view is a Default-Editor-Topic-View + private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToEdit = new ArrayList<Pair<String,TopicIdentifierTypes>>(); // the GWT base for this panel private AbsolutePanel mainPanel = new AbsolutePanel(); @@ -65,46 +63,28 @@ } - protected GdlPanel(Pair<String, TopicIdentifierTypes> instanceIdentifier){ + protected GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> topicsToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate) throws ExecutionException{ this(); - if(instanceIdentifier != null && instanceIdentifier.getFirst() != null && instanceIdentifier.getSecond() != null){ - this.requestedInstance = instanceIdentifier; - } - } + if(topicsToEdit != null && topicsToEdit.size() != 0)this.requestedTopicsToEdit = topicsToEdit; + if(topicToCreate != null && topicToCreate.size() != 0)this.requestedTopicsToCreate = topicToCreate; - - public GdlPanel(Pair<String, TopicIdentifierTypes> instanceIdentifier, int width, int height){ - this(instanceIdentifier); - this.setPixelSize(width, height); + if(this.requestedTopicsToCreate.size() != 0 && this.requestedTopicsToEdit.size() != 0) + throw new ExecutionException("only one container can be set, i.e. either topics to create or topics to edit"); } + - - public GdlPanel(Pair<String, TopicIdentifierTypes> instanceIdentifier, String width, String height){ - this(instanceIdentifier); - this.setSize(width, height); - } - - - protected GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers){ - this(); - if(typeIdentifiers != null){ - requestedTypes = typeIdentifiers; - } - } - - - public GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers, int width, int height){ - this(typeIdentifiers); + public GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> topicsToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, int width, int height) throws ExecutionException{ + this(topicsToEdit, topicToCreate); this.setPixelSize(width, height); } - public GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers, String width, String height){ - this(typeIdentifiers); + public GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> topicsToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> topicToCreate, String width, String height) throws ExecutionException{ + this(topicsToEdit, topicToCreate); this.setSize(width, height); } - + public void registerOnErrorHandler(String descriptorId, IOnErrorCallback handler){ if(!localOnErrorContainer.contains(handler)){ localOnErrorContainer.add(handler); @@ -188,7 +168,7 @@ if(this.loadSchemaCallback == null){ throw new ExecutionException("No LoadSchemaCallback was set yet"); } - this.loadSchemaCallback.loadSchema(this, this.requestedInstance, this.requestedTypes); + this.loadSchemaCallback.loadSchema(this, this.requestedTopicsToEdit, this.requestedTopicsToCreate); }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.LoadError, e); @@ -278,8 +258,8 @@ // Creates the actual view from the requested topic map public void createView(){ try{ - view = GdlInstantiator.instantiateDefaultEditorOrCreatorView(requestedInstance, requestedTypes, this.requestedSchemaTm); - Window.alert("view: " + view); + //view = GdlInstantiator.instantiateDefaultEditorOrCreatorView(requestedTopicsTo, requestedTopicToCreat, this.requestedSchemaTm); + //TODO: implement mainPanel.add(view); for (Pair<ClickHandler, String> item : this.buttonCallbacks) { view.registerButtonCallback(item.getFirst(), item.getSecond()); 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 Wed Jul 13 04:57:28 2011 (r607) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Jul 13 05:38:00 2011 (r608) @@ -39,7 +39,10 @@ mainPanel.setBorderWidth(1); mainPanel.setPixelSize(500, 500); - gdlPanel = new GdlPanel(new Pair<String, TopicIdentifierTypes>("http://mytop/psi-1", TopicIdentifierTypes.SubjectIdentifier)); + ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + 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)); + gdlPanel = new GdlPanel(null, requestedTopicsToCreate); gdlPanel.setPixelSize(100, 100); DOM.setStyleAttribute(gdlPanel.getElement(), "backgroundColor", "yellow"); mainPanel.add(gdlPanel); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java Wed Jul 13 04:57:28 2011 (r607) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java Wed Jul 13 05:38:00 2011 (r608) @@ -6,5 +6,5 @@ import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; public interface ILoadSchemaCallback { - public void loadSchema(GdlPanel panel, Pair<String, TopicIdentifierTypes> instanceIdentifier, ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers)throws RequestException; + public void loadSchema(GdlPanel panel, ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToEdit, ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate)throws RequestException; } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Wed Jul 13 04:57:28 2011 (r607) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Wed Jul 13 05:38:00 2011 (r608) @@ -24,8 +24,8 @@ // addressable by the URI isidorusUrl public class LoadSchemaCallback implements ILoadSchemaCallback{ private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "test.gdl.jtm"); // TODO: replace with the correct URL - private ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers = new ArrayList<Pair<String,TopicIdentifierTypes>>(); - private Pair<String, TopicIdentifierTypes> instanceIdentifier = null; + private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToEdit = new ArrayList<Pair<String,TopicIdentifierTypes>>(); private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, isidorusUrl); @@ -34,9 +34,9 @@ // this method is invoked as a callback method @Override - public void loadSchema(GdlPanel panel, Pair<String, TopicIdentifierTypes> instanceIdentifier, ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers)throws RequestException { - this.typeIdentifiers = typeIdentifiers; - this.instanceIdentifier = instanceIdentifier; + public void loadSchema(GdlPanel panel, ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToEdit , ArrayList<Pair<String, TopicIdentifierTypes>> requestedTopicsToCreate)throws RequestException { + this.requestedTopicsToCreate = requestedTopicsToCreate; + this.requestedTopicsToEdit = requestedTopicsToEdit; requestBuilder.sendRequest(null, new RequestCallbackImpl(panel)); } @@ -75,7 +75,7 @@ public void onClick(ClickEvent event) { dialog.hide(); try{ - loadSchema(panel, instanceIdentifier, typeIdentifiers); + loadSchema(panel, LoadSchemaCallback.this.requestedTopicsToEdit, LoadSchemaCallback.this.requestedTopicsToCreate); }catch(Exception e){ Window.alert("connection to : " + isidorusUrl + " failed: " + e.getMessage()); } @@ -102,7 +102,7 @@ public void onClick(ClickEvent event) { dialog.hide(); try{ - loadSchema(panel, instanceIdentifier, typeIdentifiers); + loadSchema(panel, LoadSchemaCallback.this.requestedTopicsToEdit, LoadSchemaCallback.this.requestedTopicsToCreate); }catch(Exception e){ Window.alert("connection to : " + isidorusUrl + " failed: " + e.getMessage()); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 13 04:57:28 2011 (r607) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 13 05:38:00 2011 (r608) @@ -35,6 +35,7 @@ {"subject_identifiers":["[doc:instance-value]"], "instance_of":["si:[gdl:TM-Instance-Value]"]}, {"subject_identifiers":["[doc:multi-type-value-1]"], "instance_of":["si:[gdl:TM-Multiple-Type-Value]"]}, {"subject_identifiers":["[doc:multi-type-value-2]"], "instance_of":["si:[gdl:TM-Multiple-Type-Value]"]}, + {"subject_identifiers":["[doc:multi-type-value-3]"], "instance_of":["si:[gdl:TM-Multiple-Type-Value]"]}, {"subject_identifiers":["[gdl:Topic-View]"]}, {"subject_identifiers":["[gdl:Default-Topic-View]"]}, {"subject_identifiers":["[gdl:Special-Topic-View]"]}, @@ -72,5 +73,8 @@ {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Musician]"}]}, {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Director]"}]}, {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Poet]"}]}, - {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:tm-value]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:descriptor]", "player":"si:[doc:default-creator-topic-view-2]"}]} + {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:tm-value]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:descriptor]", "player":"si:[doc:default-creator-topic-view-2]"}]}, + {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:tm-value]", "player":"si:[doc:multi-type-value-3]"}, {"type":"si:[gdl:descriptor]", "player":"si:[doc:special-creator-topic-view]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-3]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Musician]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-3]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Poet]"}]} ]} \ No newline at end of file

1 0

[isidorus-cvs] r607 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: src/us/isidor/gdl/anaToMia/Widgets/view war/gdl_widgets
by lgiessmann＠common-lisp.net 13 Jul '11

13 Jul '11

Author: lgiessmann Date: Wed Jul 13 04:57:28 2011 New Revision: 607 Log: gdl-frontend: Widgets: added a file that contains a simple test gdl schema Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm 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 Wed Jul 13 02:27:44 2011 (r606) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Wed Jul 13 04:57:28 2011 (r607) @@ -19,6 +19,8 @@ public abstract class GdlView extends GdlVisibleObject implements IGdlContainer, IGdlHasValue { + // TODO: all setter from visible object must infer only the mainPanel + protected GdlView(){ super(); } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 13 02:27:44 2011 (r606) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm Wed Jul 13 04:57:28 2011 (r607) @@ -0,0 +1,76 @@ +{"version":"1.1", + "prefixes":{"tmcl":"http://psi.topicmaps.org/tmcl/", + "tmdm":"http://psi.topicmaps.org/iso13250/model/", + "doc":"http://psi.test.org/gdl-test/", + "gdl":"http://psi.isidor.us/gdl/"}, + "item_type":"topicmap", + "item_identifiers":["[doc:gdl-test-tm]"], + "topics":[{"subject_identifiers":["[tmcl:topic-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:role-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:association-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmcl:name-type]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[tmdm:supertype]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmdm:subtype]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[tmdm:supertype-subtype]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:contains]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:container]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:containee]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:Schema]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[gdl:schema-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[gdl:view-name]"], "instance_of":["si:[tmcl:name-type]"]}, + {"subject_identifiers":["[gdl:Descriptor]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[doc:test-schema]"], "instance_of":["si:[gdl:Schema]"], "names":[{"value": "Test GDL Schema", "type":"si:[gdl:schema-name]"}]}, + {"subject_identifiers":["[gdl:Visible-Object]"]}, + {"subject_identifiers":["[gdl:View]"]}, + {"subject_identifiers":["[gdl:Value]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[gdl:TM-Value]"]}, + {"subject_identifiers":["[gdl:TM-Instance-Value]"]}, + {"subject_identifiers":["[gdl:TM-Multiple-Type-Value]"]}, + {"subject_identifiers":["[gdl:tm-binding]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:topic-view-binding]"], "instance_of":["si:[tmcl:association-type]"]}, + {"subject_identifiers":["[gdl:tm-construct]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:descriptor]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[gdl:tm-value]"], "instance_of":["si:[tmcl:role-type]"]}, + {"subject_identifiers":["[doc:musician/John_Lennon]"], "instance_of":["si:[doc:Musician]"]}, + {"subject_identifiers":["[doc:instance-value]"], "instance_of":["si:[gdl:TM-Instance-Value]"]}, + {"subject_identifiers":["[doc:multi-type-value-1]"], "instance_of":["si:[gdl:TM-Multiple-Type-Value]"]}, + {"subject_identifiers":["[doc:multi-type-value-2]"], "instance_of":["si:[gdl:TM-Multiple-Type-Value]"]}, + {"subject_identifiers":["[gdl:Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Topic-View]"]}, + {"subject_identifiers":["[gdl:Special-Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Creator-Topic-View]"]}, + {"subject_identifiers":["[gdl:Default-Editor-Topic-View]"]}, + {"subject_identifiers":["[gdl:Special-Creator-Topic-View]"]}, + {"subject_identifiers":["[doc:default-creator-topic-view-1]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 1", "type":"si:[gdl:view-name]"}]}, + {"subject_identifiers":["[doc:default-creator-topic-view-2]"], "instance_of":["si:[gdl:Default-Creator-Topic-View]"], "names":[{"value": "Def. Creator View 2", "type":"si:[gdl:view-name]"}]}, + {"subject_identifiers":["[doc:default-editor-topic-view]"], "instance_of":["si:[gdl:Default-Editor-Topic-View]"], "names":[{"value": "Def. Editor View", "type":"si:[gdl:view-name]"}]}, + {"subject_identifiers":["[doc:special-creator-topic-view]"], "instance_of":["si:[gdl:Special-Creator-Topic-View]"], "names":[{"value": "Spec. Creator View", "type":"si:[gdl:view-name]"}]}, + {"subject_identifiers":["[doc:Poet]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[doc:Musician]"], "instance_of":["si:[tmcl:topic-type]"]}, + {"subject_identifiers":["[doc:Director]"], "instance_of":["si:[tmcl:topic-type]"]} + ], + "associations":[{"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Descriptor]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Visible-Object]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Visible-Object]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Special-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Creator-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Default-Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Default-Editor-Topic-View]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Special-Topic-View]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:Special-Creator-Topic-View]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-creator-topic-view-1]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-creator-topic-view-2]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:default-editor-topic-view]"}]}, + {"type":"si:[gdl:contains]", "roles":[{"type":"si:[gdl:container]", "player":"si:[doc:test-schema]"},{"type":"si:[gdl:containee]", "player":"si:[doc:special-creator-topic-view]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:TM-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:TM-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:TM-Instance-Value]"}]}, + {"type":"si:[tmdm:supertype-subtype]", "roles":[{"type":"si:[tmdm:supertype]", "player":"si:[gdl:TM-Value]"},{"type":"si:[tmdm:subtype]", "player":"si:[gdl:TM-Multiple-Type-Value]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:instance-value]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:musician/John_Lennon]"}]}, + {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:tm-value]", "player":"si:[doc:instance-value]"}, {"type":"si:[gdl:descriptor]", "player":"si:[doc:default-editor-topic-view]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-1]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Musician]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-1]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Poet]"}]}, + {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:tm-value]", "player":"si:[doc:multi-type-value-1]"}, {"type":"si:[gdl:descriptor]", "player":"si:[doc:default-creator-topic-view-1]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Musician]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Director]"}]}, + {"type":"si:[gdl:tm-binding]", "roles":[{"type":"si:[gdl:descriptor]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:tm-construct]", "player":"si:[doc:Poet]"}]}, + {"type":"si:[gdl:topic-view-binding]", "roles":[{"type":"si:[gdl:tm-value]", "player":"si:[doc:multi-type-value-2]"}, {"type":"si:[gdl:descriptor]", "player":"si:[doc:default-creator-topic-view-2]"}]} + ]} \ No newline at end of file

1 0

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

13 Jul '11

Author: lgiessmann Date: Wed Jul 13 02:27:44 2011 New Revision: 606 Log: gdl-frontend: Widgets: changed the test class for launching a test and importing a test gdl schema Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm 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/TestClass.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.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 Tue Jul 12 13:26:22 2011 (r605) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Wed Jul 13 02:27:44 2011 (r606) @@ -17,6 +17,7 @@ import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultTopicView; import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.Composite; @@ -69,8 +70,6 @@ if(instanceIdentifier != null && instanceIdentifier.getFirst() != null && instanceIdentifier.getSecond() != null){ this.requestedInstance = instanceIdentifier; } - - createView(); } @@ -91,8 +90,6 @@ if(typeIdentifiers != null){ requestedTypes = typeIdentifiers; } - - createView(); } @@ -138,7 +135,7 @@ // some setters for callback instances - public void setLoadCallback(ILoadSchemaCallback callback){ + public void setLoadSchemaCallback(ILoadSchemaCallback callback){ if(callback != null){ this.loadSchemaCallback = callback; } @@ -160,7 +157,7 @@ // some getters for callback instances - public ILoadSchemaCallback getLoadCallback(){ + public ILoadSchemaCallback getLoadSchemaCallback(){ return this.loadSchemaCallback; } @@ -183,16 +180,15 @@ // this method is responsible for loading the Topic Map by using the // loadCallback. After a successfully load operation the // onLoadHandlers are executed - public void doLoad(){ + public void loadSchema(){ try{ if(tmEngine == null || requestedSchemaTm == null){ throw new ExecutionException("No Topic Maps engine was set yet"); } if(this.loadSchemaCallback == null){ - throw new ExecutionException("No LoadCallback was set yet"); + throw new ExecutionException("No LoadSchemaCallback was set yet"); } this.loadSchemaCallback.loadSchema(this, this.requestedInstance, this.requestedTypes); - }catch(Exception e){ for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.LoadError, e); @@ -283,11 +279,14 @@ public void createView(){ try{ view = GdlInstantiator.instantiateDefaultEditorOrCreatorView(requestedInstance, requestedTypes, this.requestedSchemaTm); + Window.alert("view: " + view); mainPanel.add(view); for (Pair<ClickHandler, String> item : this.buttonCallbacks) { view.registerButtonCallback(item.getFirst(), item.getSecond()); } }catch(Exception e){ + Window.alert("could not create a view (" + e.getClass() + "): " + e.getMessage()); + e.printStackTrace(); for (IOnErrorCallback handler : localOnErrorContainer) { handler.onError(GdlErrorTypes.ViewCreationError, e); } 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 Tue Jul 12 13:26:22 2011 (r605) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Wed Jul 13 02:27:44 2011 (r606) @@ -44,26 +44,23 @@ DOM.setStyleAttribute(gdlPanel.getElement(), "backgroundColor", "yellow"); mainPanel.add(gdlPanel); gdlPanel.setTmEngine(new JtmsTmEngine()); + gdlPanel.setLoadSchemaCallback(new LoadSchemaCallback()); - Button requestButton = new Button("start request"); + + Button requestButton = new Button("load schema"); requestButton.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { - LoadSchemaCallback callback = new LoadSchemaCallback(); - try{ - callback.loadSchema(gdlPanel, null, new ArrayList<Pair<String,TopicIdentifierTypes>>()); - }catch(Exception e){ - Window.alert("cought error: " + e.getLocalizedMessage()); - } + gdlPanel.loadSchema(); } }); mainPanel.add(requestButton); + - - + /* // only for testing Topic tmpRepresentative = gdlPanel.getSchemaTm().createTopicBySubjectIdentifier(gdlPanel.getSchemaTm().createLocator("http://test.org/test-top")); @@ -179,6 +176,7 @@ } }; this.mainPanel.add(tmp); + */ }catch(Exception e){ e.printStackTrace(); Window.alert(">> e >> " + e.getClass() + " >> " + e.getMessage()); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Tue Jul 12 13:26:22 2011 (r605) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Wed Jul 13 02:27:44 2011 (r606) @@ -23,7 +23,7 @@ // this class can be used as a callback that requests the Topic Map data // addressable by the URI isidorusUrl public class LoadSchemaCallback implements ILoadSchemaCallback{ - private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "test.jtm"); // TODO: replace with the correct URL + private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "test.gdl.jtm"); // TODO: replace with the correct URL private ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers = new ArrayList<Pair<String,TopicIdentifierTypes>>(); private Pair<String, TopicIdentifierTypes> instanceIdentifier = null; private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, isidorusUrl); @@ -61,13 +61,13 @@ try{ if(panel.getTmEngine() == null || panel.getSchemaTm() == null) throw new ExecutionException("no Topic Maps engine was set yet"); panel.getTmEngine().importTopicMap(response.getText(), panel.getSchemaTm()); + panel.createView(); }catch(ExecutionException e){ Window.alert("Execution Error: " + e.getMessage()); }catch(Exception e){ Window.alert("panel: " + panel + ", tm: " + panel.getSchemaTm() + "\ncought error: " + e.getLocalizedMessage()); // TODO: implement smarter error handling e.printStackTrace(); } - panel.createView(); } else { final ButtonDialog dialog = new ButtonDialog("Connection Error", "The request to " + isidorusUrl + " failed\n" + response.getStatusCode() + ": " + response.getStatusText(), "retry", "cancel", null, null); dialog.setLeftButtonClickHandler(new ClickHandler() { 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 Tue Jul 12 13:26:22 2011 (r605) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Wed Jul 13 02:27:44 2011 (r606) @@ -48,7 +48,7 @@ } - // Searches the topic that represents the first item that is playced within this view instance + // Searches the topic that represents the first item that is placed within this view instance // i.e. such an item must not have an association that is bound to it via a role of the type // gdl:ancestor. protected Topic getStartElement() throws InvalidGdlSchemaException { Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/war/gdl_widgets/test.gdl.jtm ==============================================================================

1 0

[isidorus-cvs] r605 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base environment
by lgiessmann＠common-lisp.net 12 Jul '11

12 Jul '11

Author: lgiessmann Date: Tue Jul 12 13:26:22 2011 New Revision: 605 Log: gdl-frontend: Widgets: implemted a mehtod that instantiates the default topic view, i.e. the entry point 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/environment/GdlInstantiator.java 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 Tue Jul 12 08:16:49 2011 (r604) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Tue Jul 12 13:26:22 2011 (r605) @@ -2,8 +2,6 @@ import java.util.ArrayList; import com.google.gwt.core.client.JsArray; - -import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Locator; @@ -11,13 +9,28 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.ScopedStub; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; -import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; + public class GdlPsis { public final static String gdl = "http://psi.isidor.us/gdl/"; + + // some psis of the TMDM + public class TMDM{ + public final static String supertype = "http://psi.topicmaps.org/iso13250/model/supertype"; + public final static String subtype = "http://psi.topicmaps.org/iso13250/model/subtype"; + public final static String supertypeSubtype = "http://psi.topicmaps.org/iso13250/model/supertype-subtype"; + + } + + // some psis of the TMCL + public class TMCL { + public final static String topictype = "http://psi.topicmaps.org/tmcl/topic-type"; + } + + // topic types public class TopicType{ public final static String gdlSchema = gdl + "Schema"; @@ -333,26 +346,73 @@ ArrayList<Topic> localCollectedSuperTypes = new ArrayList<Topic>(); if(collectedSupertypes != null) localCollectedSuperTypes = collectedSupertypes; + ArrayList<Topic> direcSupertypes = getDirectSuperTypes(top); + for (Topic topic : localCollectedSuperTypes) direcSupertypes.remove(topic); //avoid duplicates + for (Topic topic : direcSupertypes)localCollectedSuperTypes.add(topic); + + for (Topic topic : direcSupertypes){ + ArrayList<Topic> tmp = getAllSuperTypes(topic, localCollectedSuperTypes); + for (Topic tmpTopic : tmp) localCollectedSuperTypes.add(tmpTopic); + } + return localCollectedSuperTypes; + } + + + // returns the direct supertypes of the passed topic + public static ArrayList<Topic> getDirectSuperTypes(Topic top){ + ArrayList<Topic> result = new ArrayList<Topic>(); + if(top == null) return result; + TopicMap tm = top.getTopicMap(); + Topic subtype = getTopicByPsi(TMDM.subtype, tm); + Topic supertype = getTopicByPsi(TMDM.supertype, tm); + Topic supertypeSubtype = getTopicByPsi(TMDM.supertypeSubtype, tm); + + if(subtype == null || supertype == null || supertypeSubtype == null) return result; + JsArray<Role> validRoles = top.getRolesPlayed(subtype, supertypeSubtype); + for(int i = 0; i != validRoles.length(); ++i){ + Association parent = validRoles.get(i).getParent(); + if(parent.getRoles().length() == 2 && parent.getRoles(supertype).length() == 1)result.add(parent.getRoles(supertypeSubtype).get(0).getPlayer()); + } + return result; + } + + + // returns true if a corresponding association exists + public static boolean hasAssociation(Topic thisTopic, Topic thisRoleType, Topic assocType, Topic otherPlayer, Topic otherRoleType){ + if(thisTopic == null || thisRoleType == null || assocType == null || otherPlayer == null || otherRoleType == null) return false; - // TODO: implement - return null; + JsArray<Role> roles = thisTopic.getRolesPlayed(thisRoleType, assocType); + for(int i = 0; i != roles.length(); ++i){ + Association parent = roles.get(i).getParent(); + JsArray<Role> otherRoles = parent.getRoles(otherRoleType); + for(int j = 0; j != otherRoles.length(); ++j) + if(otherRoles.get(j).getPlayer().equals(otherPlayer)) return true; + } + + return false; } - // returns the other player of an assocition with two roles and the correct values - public static ArrayList<Topic> getOtherPlayer(Topic thisTopic, Topic thisRoleType, Topic assocType, ArrayList<Topic> scope, Topic otherRoleType){ + // returns the other player of an association with two roles and the correct values + public static ArrayList<Topic> getOtherPlayerOfBinaryAssociation(Topic thisTopic, Topic thisRoleType, Topic assocType, ArrayList<Topic> scope, Topic otherRoleType){ ArrayList<Topic> result = new ArrayList<Topic>(); if(thisTopic == null || thisRoleType == null || assocType == null || otherRoleType == null) return result; JsArray<Role> roles = thisTopic.getRolesPlayed(thisRoleType, assocType); for(int i = 0; i != roles.length(); ++i){ Association parent = roles.get(i).getParent(); - if(parent.getRoles(otherRoleType).length() == 1) result.add(parent.getRoles(otherRoleType).get(0).getPlayer()); + if(parent.getRoles().length() != 2) return result; + if(thisRoleType.equals(otherRoleType) && parent.getRoles(thisTopic).length() == 2){ + if(parent.getRoles(thisRoleType).get(0).getPlayer().equals(thisTopic)) result.add(parent.getRoles(thisRoleType).get(1).getPlayer()); + else result.add(parent.getRoles(thisRoleType).get(0).getPlayer()); + }else if(parent.getRoles(otherRoleType).length() == 1){ + result.add(parent.getRoles(otherRoleType).get(0).getPlayer()); + } } return result; } - + // returns true if the instance topic is an instance of the topic bound to typeSubectIdentifier public static boolean isInstanceOf(Topic instance, String typeSubjectIdentifier){ 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 Tue Jul 12 08:16:49 2011 (r604) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Tue Jul 12 13:26:22 2011 (r605) @@ -123,6 +123,7 @@ if(defaultCreatorTopicView == null && defaultEditorTopicView == null){ throw new InvalidGdlSchemaException("the requested GDL schema does not have an entry point defined, either an instance of " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " or " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " is necessary"); }else { + // all topics (types) that have to be displayed by a view ArrayList<Topic> topsToDisplay = new ArrayList<Topic>(); if(instanceTopic != null){ topsToDisplay.add(GdlPsis.getTopicByAnyIdentifier(instanceTopic, tm)); @@ -131,15 +132,69 @@ topsToDisplay.add(GdlPsis.getTopicByAnyIdentifier(pair, tm)); } } + + // get the TM-Value instance that is bound to the topic (type) and the view instance + ArrayList<Topic> tmValues = new ArrayList<Topic>(); + Topic descriptor = GdlPsis.getTopicByPsi(GdlPsis.RoleType.gdlDescriptor, tm); + Topic tmBinding = GdlPsis.getTopicByPsi(GdlPsis.AssociationType.gdlTmBinding, tm); + Topic tmValue = GdlPsis.getTopicByPsi(GdlPsis.RoleType.gdlTmValue, tm); + Topic TmValue = GdlPsis.getTopicByPsi(GdlPsis.TopicType.gdlTmValue, tm); + Topic tmConstruct = GdlPsis.getTopicByPsi(GdlPsis.RoleType.gdlTmConstruct, tm); + for (Topic topic : topsToDisplay) { + ArrayList<Topic> potentialTmValues = GdlPsis.getOtherPlayerOfBinaryAssociation(topic, tmConstruct, tmBinding, null, descriptor); + for (Topic potentialTmValue : potentialTmValues) + if(GdlPsis.isInstanceOf(potentialTmValue, TmValue)) tmValues.add(potentialTmValue); + } - // TODO: implement - // get tm-values for each topic - // reduce tm-values to instances that are shared by all topics to display - // filter shared tm-values for default-topic-view associations - // return default-topic-view + // get only the tm-value that binds all topics to be displayed to the current view + ArrayList<Topic> invalidTmValues = new ArrayList<Topic>(); + Topic topictype = GdlPsis.getTopicByPsi(GdlPsis.TMCL.topictype, tm); + for (Topic value : tmValues) { + for (Topic topToDisplay : topsToDisplay) { + ArrayList<Pair<Topic, Topic>> roles = new ArrayList<Pair<Topic,Topic>>(); + roles.add(new Pair<Topic, Topic>(topictype, tmConstruct)); + if(GdlPsis.hasAssociation(topToDisplay, tmConstruct, tmBinding, value, descriptor) || + GdlPsis.getAssociationsOfTopic(value, descriptor, tmBinding, null, roles).size() != topsToDisplay.size()){ + invalidTmValues.add(value); + } + } + } + for (Topic invalid : invalidTmValues)tmValues.remove(invalid); - return null; + // get all default topic views that are bound to the existent tm-values + ArrayList<Topic> defaultTopicViews = new ArrayList<Topic>(); + Topic defaultTopicView = GdlPsis.getTopicByPsi(GdlPsis.TopicType.gdlDefaultTopicView, tm); + Topic topicViewBinding = GdlPsis.getTopicByPsi(GdlPsis.AssociationType.gdlTopicViewBinding, tm); + for (Topic validTmValue : tmValues) { + ArrayList<Topic> views = GdlPsis.getOtherPlayerOfBinaryAssociation(validTmValue, tmValue, topicViewBinding, null, descriptor); + for (Topic view : views) if(GdlPsis.isInstanceOf(view, defaultTopicView)) defaultTopicViews.add(view); + } + + // return default-topic-view + if(defaultTopicViews.size() > 2){ + String values = ""; + for (Topic topic : topsToDisplay)values += ", " + GdlPsis.getAnyIdOfTopic(topic); + if(values.length() >= 2) values = values.substring(2); + throw new InvalidGdlSchemaException("only one default editor or creator topic view can be bound to a topic, but found " + values); + } else if(defaultTopicViews.size() == 1){ + return (GdlDefaultTopicView)instantiate(defaultTopicViews.get(0)); + } else if(defaultTopicViews.size() == 2){ // one creator and one editor view + Topic creatorView = null; + Topic editorView = null; + if(GdlPsis.isInstanceOf(defaultTopicViews.get(0), GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ + creatorView = defaultTopicViews.get(0); + editorView = defaultTopicViews.get(1); + }else { + creatorView = defaultTopicViews.get(1); + editorView = defaultTopicViews.get(0); + } + + if(instanceTopic != null)return new GdlDefaultEditorTopicView(editorView); + else return new GdlDefaultCreatorTopicView(creatorView); + } else { + return null; + } } } }

1 0

[isidorus-cvs] r604 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets: lib src/us/isidor/gdl/anaToMia/Widgets/base src/us/isidor/gdl/anaToMia/Widgets/environment src/us/isidor/gdl/anaToMia/Widgets/isidorus
by lgiessmann＠common-lisp.net 12 Jul '11

12 Jul '11

Author: lgiessmann Date: Tue Jul 12 08:16:49 2011 New Revision: 604 Log: gdl-frontend: Widgets: started to implement some methods to get the default-topic-view instance for getting the entry point of the view Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/TopicIdentifierTypes.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/lib/GDL_TopicMaps_Model.jar 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/GdlPsis.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/environment/GdlInstantiator.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/lib/GDL_TopicMaps_Model.jar ============================================================================== Binary file (source and/or target). No diff available. 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 Tue Jul 12 06:19:11 2011 (r603) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Tue Jul 12 08:16:49 2011 (r604) @@ -6,12 +6,14 @@ import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.GdlErrorTypes; +import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; import us.isidor.gdl.anaToMia.Widgets.environment.ICommitCallback; 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; import com.google.gwt.event.dom.client.ClickHandler; @@ -33,10 +35,10 @@ // If requestedTypes is not null or length != 0, the string values must be treated as topic // identifiers of a topic type. The created GDL view must be a Default-Topic-Creator-View - private String[] requestedTypes = new String[]{}; + private ArrayList<Pair<String, TopicIdentifierTypes>> requestedTypes = new ArrayList<Pair<String, TopicIdentifierTypes>>(); // If requestedInstance is not null or != "", the string value must be treated as a topic identifier // of a particular topic instance. The created GDL view must be a Default-Topic-Editor-View - private String requestedInstance = ""; + private Pair<String, TopicIdentifierTypes> requestedInstance = null; // the GWT base for this panel private AbsolutePanel mainPanel = new AbsolutePanel(); @@ -62,9 +64,9 @@ } - protected GdlPanel(String instanceIdentifier){ + protected GdlPanel(Pair<String, TopicIdentifierTypes> instanceIdentifier){ this(); - if(instanceIdentifier != null){ + if(instanceIdentifier != null && instanceIdentifier.getFirst() != null && instanceIdentifier.getSecond() != null){ this.requestedInstance = instanceIdentifier; } @@ -72,19 +74,19 @@ } - public GdlPanel(String instanceIdentifier, int width, int height){ + public GdlPanel(Pair<String, TopicIdentifierTypes> instanceIdentifier, int width, int height){ this(instanceIdentifier); this.setPixelSize(width, height); } - public GdlPanel(String instanceIdentifier, String width, String height){ + public GdlPanel(Pair<String, TopicIdentifierTypes> instanceIdentifier, String width, String height){ this(instanceIdentifier); this.setSize(width, height); } - protected GdlPanel(String[] typeIdentifiers){ + protected GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers){ this(); if(typeIdentifiers != null){ requestedTypes = typeIdentifiers; @@ -94,13 +96,13 @@ } - public GdlPanel(String[] typeIdentifiers, int width, int height){ + public GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers, int width, int height){ this(typeIdentifiers); this.setPixelSize(width, height); } - public GdlPanel(String[] typeIdentifiers, String width, String height){ + public GdlPanel(ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers, String width, String height){ this(typeIdentifiers); this.setSize(width, height); } @@ -280,11 +282,8 @@ // Creates the actual view from the requested topic map public void createView(){ try{ - // TODO: Implement - // search for an instance of default-[editor|creator]-topic-view (only one of those must be existent) - // use gdl instaiator - - + view = GdlInstantiator.instantiateDefaultEditorOrCreatorView(requestedInstance, requestedTypes, this.requestedSchemaTm); + mainPanel.add(view); for (Pair<ClickHandler, String> item : this.buttonCallbacks) { view.registerButtonCallback(item.getFirst(), item.getSecond()); } 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 Tue Jul 12 06:19:11 2011 (r603) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Tue Jul 12 08:16:49 2011 (r604) @@ -1,6 +1,19 @@ package us.isidor.gdl.anaToMia.Widgets.base; +import java.util.ArrayList; +import com.google.gwt.core.client.JsArray; + +import us.isidor.gdl.anaToMia.TopicMaps.TmEngineModel.TmEngine; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Association; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Construct; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Locator; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Role; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.ScopedStub; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMap; +import us.isidor.gdl.anaToMia.Widgets.environment.GdlInstantiator; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; public class GdlPsis { public final static String gdl = "http://psi.isidor.us/gdl/"; @@ -201,7 +214,7 @@ public final static String gdlNthPosition = gdl + "nth-position"; public final static String gdlButtonPosition = gdl + "button-position"; public final static String gdlTmBinding = gdl + "tm-binding"; - public final static String gdlViewBinding = gdl + "view-binding"; + public final static String gdlTopicViewBinding = gdl + "topic-view-binding"; } @@ -216,6 +229,7 @@ public final static String gdlNthElement = gdl + "nth-element"; public final static String gdlHiddenValue = gdl + "hidden-value"; public final static String gdlValueGroup = gdl + "value-group"; + public final static String gdlTmValue = gdl + "tm-value"; } @@ -227,6 +241,45 @@ } + // a helper that returns the topic bound to the identifier via a subject identifier + public static Topic getTopicByPsi(String subjectIdentifier, TopicMap tm){ + if(subjectIdentifier == null || tm == null) return null; + + Locator loc = tm.createLocator(subjectIdentifier); + return tm.getTopicBySubjectIdentifier(loc); + } + + + // a helper that returns the topic bound to the identifier via a subject locator + public static Topic getTopicBySl(String subjectLocator, TopicMap tm){ + if(subjectLocator == null || tm == null) return null; + + Locator loc = tm.createLocator(subjectLocator); + return tm.getTopicBySubjectLocator(loc); + } + + + // a helper that returns the topic bound to the identifier via an item identifier + public static Topic getTopicByIi(String itemIdentifier, TopicMap tm){ + if(itemIdentifier == null || tm == null) return null; + + Locator loc = tm.createLocator(itemIdentifier); + return (Topic)tm.getConstructByItemIdentifier(loc); + } + + + // returns a topic that is identified by ref + public static Topic getTopicByAnyIdentifier(Pair<String, TopicIdentifierTypes> ref, TopicMap tm){ + if(ref.getSecond() == TopicIdentifierTypes.ItemIdentifier){ + return getTopicByIi(ref.getFirst(), tm); + }else if(ref.getSecond() == TopicIdentifierTypes.SubjectLocator){ + return getTopicBySl(ref.getFirst(), tm); + }else { + return getTopicByPsi(ref.getFirst(), tm); + } + } + + // a helper method to return any identifier string of the topic public static String getAnyIdOfTopic(Topic topic){ if(topic.getSubjectIdentifiers().length() != 0){ @@ -239,4 +292,147 @@ return null; } } + + + // returns all instances of the topic type + public static ArrayList<Topic> getInstanceOf(Topic type, boolean multipleTypesAllowed){ + ArrayList<Topic> result = new ArrayList<Topic>(); + TopicMap tm = type.getTopicMap(); + + for(int i = 0; i != tm.getTopics().length(); ++i){ + if(multipleTypesAllowed){ + if(isInstanceOf(tm.getTopics().get(i), type)) result.add(tm.getTopics().get(i)); + } else { + if(isInstanceOf(tm.getTopics().get(i), type) && tm.getTopics().get(i).getTypes().length() == 1) result.add(tm.getTopics().get(i)); + } + } + + return result; + } + + + // returns true if the topic instance if an instance of the topic type + public static boolean isInstanceOf(Topic instance, Topic type){ + if(instance == null || type == null) return false; + + JsArray<Topic> types = instance.getTypes(); + for(int i = 0; i != types.length(); ++i){ + ArrayList<Topic> superTypes = getAllSuperTypes(types.get(i), null); + superTypes.add(types.get(i)); + if(superTypes.contains(type)) return true; + } + + return false; + } + + + // returns an array list with all direct and indirect supertypes of top + public static ArrayList<Topic> getAllSuperTypes(Topic top, ArrayList<Topic> collectedSupertypes){ + if(top == null) return new ArrayList<Topic>(); + + ArrayList<Topic> localCollectedSuperTypes = new ArrayList<Topic>(); + if(collectedSupertypes != null) localCollectedSuperTypes = collectedSupertypes; + + + + // TODO: implement + return null; + } + + + // returns the other player of an assocition with two roles and the correct values + public static ArrayList<Topic> getOtherPlayer(Topic thisTopic, Topic thisRoleType, Topic assocType, ArrayList<Topic> scope, Topic otherRoleType){ + ArrayList<Topic> result = new ArrayList<Topic>(); + if(thisTopic == null || thisRoleType == null || assocType == null || otherRoleType == null) return result; + + JsArray<Role> roles = thisTopic.getRolesPlayed(thisRoleType, assocType); + for(int i = 0; i != roles.length(); ++i){ + Association parent = roles.get(i).getParent(); + if(parent.getRoles(otherRoleType).length() == 1) result.add(parent.getRoles(otherRoleType).get(0).getPlayer()); + } + return result; + } + + + // returns true if the instance topic is an instance of the topic bound to typeSubectIdentifier + public static boolean isInstanceOf(Topic instance, String typeSubjectIdentifier){ + TopicMap tm = instance.getTopicMap(); + Topic type = tm.getTopicBySubjectIdentifier(tm.createLocator(typeSubjectIdentifier)); + return isInstanceOf(instance, type); + } + + + // returns true if the passed association has exactly the corresponding roles to + // the array list rolePlayersAndTypes + public static boolean hasRoles(Association assoc, ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes){ + if(assoc == null) return false; + if(assoc.getRoles().length() == 0 && rolePlayertypesAndTypes == null) return true; + if(assoc.getRoles().length() != rolePlayertypesAndTypes.size()) return false; + + for (Pair<Topic, Topic> pair : rolePlayertypesAndTypes) { + JsArray<Role> selection = assoc.getRoles(pair.getSecond()); + int i = 0; + for(; i != selection.length(); ++i){ + if(isInstanceOf(selection.get(i).getPlayer(), pair.getFirst())) break; + } + + if(i == selection.length()) return false; + } + + return true; + } + + + // returns true if the topics of themes are all equal to the scope of construct + public static boolean hasThemes(Construct construct, ArrayList<Topic> themes){ + if(construct == null) return false; + + ScopedStub scoped = (ScopedStub)construct; + if(scoped.getScope().length() != 0 && (themes == null || themes.size() == 0)) return false; + if(scoped.getScope().length() != themes.size()) return false; + + for(int i = 0; i != scoped.getScope().length(); ++i){ + if(!themes.contains(scoped.getScope().get(i))) return false; + } + + return true; + } + + + // returns all topics that are instances if tm-value, which are also bound to this + // topic via a gdl:tm-binding association + public static ArrayList<Topic> getTmValues(Topic top){ + ArrayList<Topic> result = new ArrayList<Topic>(); + if(top == null) return result; + TopicMap tm = top.getTopicMap(); + Topic descriptor = getTopicByPsi(RoleType.gdlDescriptor, tm); + Topic tmBinding = getTopicByPsi(AssociationType.gdlTmBinding, tm); + Topic tmValue = getTopicByPsi(TopicType.gdlTmValue, tm); + + JsArray<Role> roles = top.getRolesPlayed(descriptor, tmBinding); + for(int i = 0; i != roles.length(); ++i){ + Association parent = roles.get(i).getParent(); + if(parent.getRoles().length() == 2 && parent.getRoles(descriptor).length() == 1 && + isInstanceOf(parent.getRoles(descriptor).get(0).getPlayer(), tmValue)) + result.add(parent.getRoles(descriptor).get(0).getPlayer()); + } + return result; + } + + + // returns the associations that are bound to the topic "topic" and have the passed scope and roles + public static ArrayList<Association> getAssociationsOfTopic(Topic topic, Topic roleType, Topic assocType, ArrayList<Topic> scope, ArrayList<Pair<Topic, Topic>> rolePlayertypesAndTypes){ + ArrayList<Association> result = new ArrayList<Association>(); + if(topic == null || assocType == null || rolePlayertypesAndTypes == null || rolePlayertypesAndTypes.size() == 0) return result; + + ArrayList<Association> allPotentialAssocs = new ArrayList<Association>(); + for(int i = 0; i != topic.getRolesPlayed(roleType, assocType).length(); ++i) allPotentialAssocs.add(topic.getRolesPlayed(roleType, assocType).get(i).getParent()); + + ArrayList<Association> assocsWoScope = new ArrayList<Association>(); + for (Association assoc : allPotentialAssocs) if(hasRoles(assoc, rolePlayertypesAndTypes)) assocsWoScope.add(assoc); + + for (Association assoc : assocsWoScope) if(hasThemes(assoc, scope)) result.add(assoc); + + return result; + } } 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 Tue Jul 12 06:19:11 2011 (r603) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Tue Jul 12 08:16:49 2011 (r604) @@ -12,6 +12,7 @@ import us.isidor.gdl.anaToMia.Widgets.container.GdlUnit; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; import us.isidor.gdl.anaToMia.Widgets.isidorus.LoadSchemaCallback; import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; import us.isidor.gdl.anaToMia.Widgets.view.GdlView; @@ -38,7 +39,7 @@ mainPanel.setBorderWidth(1); mainPanel.setPixelSize(500, 500); - gdlPanel = new GdlPanel(""); + gdlPanel = new GdlPanel(new Pair<String, TopicIdentifierTypes>("http://mytop/psi-1", TopicIdentifierTypes.SubjectIdentifier)); gdlPanel.setPixelSize(100, 100); DOM.setStyleAttribute(gdlPanel.getElement(), "backgroundColor", "yellow"); mainPanel.add(gdlPanel); @@ -51,7 +52,7 @@ public void onClick(ClickEvent event) { LoadSchemaCallback callback = new LoadSchemaCallback(); try{ - callback.loadSchema(gdlPanel, "", new String[]{}); + callback.loadSchema(gdlPanel, null, new ArrayList<Pair<String,TopicIdentifierTypes>>()); }catch(Exception e){ Window.alert("cought error: " + e.getLocalizedMessage()); } 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 Tue Jul 12 06:19:11 2011 (r603) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Tue Jul 12 08:16:49 2011 (r604) @@ -1,8 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.environment; -import com.google.gwt.core.client.JsArray; -import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Locator; +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; @@ -37,88 +36,63 @@ import us.isidor.gdl.anaToMia.Widgets.view.GdlSpecialEditorTopicView; -public class GdlInstantiator { - // a helper that returns the topic bound to the identifier via a subject identifier - private static Topic getTopicByPsi(String subjectIdentifier, TopicMap tm){ - if(subjectIdentifier == null || tm == null) return null; - - Locator loc = tm.createLocator(subjectIdentifier); - return tm.getTopicBySubjectIdentifier(loc); - } - - - // returns true if the passed topic instance is a subtype of the topic bound to the passed - // type subjectIdenifier; the instance must have only one type, otherwise the result is false - private static boolean isInstanceOf(Topic instance, String typeSubjectIdentifier){ - TopicMap tm = instance.getTopicMap(); - - JsArray<Topic> types = instance.getTypes(); - if(types.length() != 1){ - return false; - }else{ - Topic type = getTopicByPsi(typeSubjectIdentifier, tm); - if(type == null) return false; - else return types.get(0).equals(type); - } - } - - +public class GdlInstantiator { // 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(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlLineBreak)){ + if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlLineBreak)){ return new GdlLineBreak(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ return new GdlInfo(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ return new GdlTitle(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){ return new GdlReference(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlRadioButton)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlRadioButton)){ return new GdlRadioButton(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCheckBox)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCheckBox)){ return new GdlCheckBox(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlActionButton)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlActionButton)){ return new GdlActionButton(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlValidateButton)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlValidateButton)){ return new GdlValidateButton(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreateButton)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreateButton)){ return new GdlCreateButton(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDeleteButton)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDeleteButton)){ return new GdlDeleteButton(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCommitButton)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCommitButton)){ return new GdlCommitButton(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlImage)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlImage)){ return new GdlImage(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlVideo)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlVideo)){ return new GdlVideo(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlAudio)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlAudio)){ return new GdlAudio(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDatePicker)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDatePicker)){ return new GdlDatePicker(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTimePicker)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTimePicker)){ return new GdlTimePicker(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDateTimePicker)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDateTimePicker)){ return new GdlDateTimePicker(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlUnit)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlUnit)){ return new GdlUnit(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlText)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlText)){ return new GdlText(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlList)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlList)){ return new GdlList(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlListBox)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlListBox)){ return new GdlListBox(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ return new GdlDefaultCreatorTopicView(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultEditorTopicView)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultEditorTopicView)){ return new GdlDefaultEditorTopicView(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialCreatorTopicView)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialCreatorTopicView)){ return new GdlSpecialCreatorTopicView(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialEditorTopicView)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialEditorTopicView)){ return new GdlSpecialEditorTopicView(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreatorAssociationview)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreatorAssociationview)){ return new GdlCreatorAssociationView(tmRepresentative); - }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlEditorAssociationView)){ + }else if(GdlPsis.isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlEditorAssociationView)){ return new GdlEditorAssociationView(tmRepresentative); }else{ String values = ""; @@ -134,19 +108,38 @@ } - public static GdlDefaultTopicView instantiateDefaultEditorOrCreatorView(TopicMap tm) throws InvalidGdlSchemaException, ExecutionException{ + // returns a DefaultTopicView instance that represents the entry point of this topic map for one of + // instanceTopic of typeTopics, i.e. one of the must be null or empty + public static GdlDefaultTopicView instantiateDefaultEditorOrCreatorView(Pair<String, TopicIdentifierTypes> instanceTopic, ArrayList<Pair<String, TopicIdentifierTypes>> typeTopics, TopicMap tm) throws InvalidGdlSchemaException, ExecutionException{ if(tm == null) return null; + if(instanceTopic != null && (typeTopics != null && typeTopics.size() != 0)){ + String values = instanceTopic.getFirst(); + for (Pair<String, TopicIdentifierTypes> pair : typeTopics) if(values.length() != 0)values += ", " + pair.getFirst(); + throw new ExecutionException("only one of topic is allowed to be set as the base topic for a " + GdlPsis.TopicType.gdlView + " but found: " + values); + } - Topic defaultCreatorTopicView = getTopicByPsi(GdlPsis.TopicType.gdlDefaultCreatorTopicView, tm); - Topic defaultEditorTopicView = getTopicByPsi(GdlPsis.TopicType.gdlDefaultEditorTopicView, tm); + Topic defaultCreatorTopicView = GdlPsis.getTopicByPsi(GdlPsis.TopicType.gdlDefaultCreatorTopicView, tm); + Topic defaultEditorTopicView = GdlPsis.getTopicByPsi(GdlPsis.TopicType.gdlDefaultEditorTopicView, tm); if(defaultCreatorTopicView == null && defaultEditorTopicView == null){ throw new InvalidGdlSchemaException("the requested GDL schema does not have an entry point defined, either an instance of " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " or " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " is necessary"); }else { - // search for an instance of either dctv or detv + ArrayList<Topic> topsToDisplay = new ArrayList<Topic>(); + if(instanceTopic != null){ + topsToDisplay.add(GdlPsis.getTopicByAnyIdentifier(instanceTopic, tm)); + }else{ + for (Pair<String, TopicIdentifierTypes> pair : typeTopics) { + topsToDisplay.add(GdlPsis.getTopicByAnyIdentifier(pair, tm)); + } + } + + // TODO: implement + // get tm-values for each topic + // reduce tm-values to instances that are shared by all topics to display + // filter shared tm-values for default-topic-view associations + // return default-topic-view + + + return null; } - return null; // TODO: remove - - // throw new InvalidGdlSchemaException("the requested GDL schema does not have an entry point defined, either an instance of " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " or " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " is necessary"); - // throw new InvalidGdlSchemaException("the requested GDL schema does have multiple entry points defined, only an instance of " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " or " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " is permitted"); } } Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java Tue Jul 12 06:19:11 2011 (r603) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/ILoadSchemaCallback.java Tue Jul 12 08:16:49 2011 (r604) @@ -1,8 +1,10 @@ package us.isidor.gdl.anaToMia.Widgets.environment; +import java.util.ArrayList; + import com.google.gwt.http.client.RequestException; import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; public interface ILoadSchemaCallback { - public void loadSchema(GdlPanel panel, String instanceIdentifier, String[] typeIdentifiers)throws RequestException; + public void loadSchema(GdlPanel panel, Pair<String, TopicIdentifierTypes> instanceIdentifier, ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers)throws RequestException; } Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/TopicIdentifierTypes.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/environment/TopicIdentifierTypes.java Tue Jul 12 08:16:49 2011 (r604) @@ -0,0 +1,7 @@ +package us.isidor.gdl.anaToMia.Widgets.environment; + +public enum TopicIdentifierTypes { + SubjectIdentifier, + SubjectLocator, + ItemIdentifier; +} Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Tue Jul 12 06:19:11 2011 (r603) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/isidorus/LoadSchemaCallback.java Tue Jul 12 08:16:49 2011 (r604) @@ -1,5 +1,7 @@ package us.isidor.gdl.anaToMia.Widgets.isidorus; +import java.util.ArrayList; + import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -14,14 +16,16 @@ import us.isidor.gdl.anaToMia.Widgets.base.GdlPanel; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; import us.isidor.gdl.anaToMia.Widgets.environment.ILoadSchemaCallback; +import us.isidor.gdl.anaToMia.Widgets.environment.Pair; +import us.isidor.gdl.anaToMia.Widgets.environment.TopicIdentifierTypes; // this class can be used as a callback that requests the Topic Map data // addressable by the URI isidorusUrl public class LoadSchemaCallback implements ILoadSchemaCallback{ private final String isidorusUrl = URL.encode(GWT.getModuleBaseURL() + "test.jtm"); // TODO: replace with the correct URL - private String[] typeIdentifiers = new String[]{}; - private String instanceIdentifier = ""; + private ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers = new ArrayList<Pair<String,TopicIdentifierTypes>>(); + private Pair<String, TopicIdentifierTypes> instanceIdentifier = null; private RequestBuilder requestBuilder = new RequestBuilder(RequestBuilder.GET, isidorusUrl); @@ -30,7 +34,7 @@ // this method is invoked as a callback method @Override - public void loadSchema(GdlPanel panel, String instanceIdentifier, String[] typeIdentifiers) throws RequestException { + public void loadSchema(GdlPanel panel, Pair<String, TopicIdentifierTypes> instanceIdentifier, ArrayList<Pair<String, TopicIdentifierTypes>> typeIdentifiers)throws RequestException { this.typeIdentifiers = typeIdentifiers; this.instanceIdentifier = instanceIdentifier; requestBuilder.sendRequest(null, new RequestCallbackImpl(panel));

1 0

[isidorus-cvs] r603 - branches/gdl-frontend/src/anaToMia/GDL_TmEngine/lib
by lgiessmann＠common-lisp.net 12 Jul '11

12 Jul '11

Author: lgiessmann Date: Tue Jul 12 06:19:11 2011 New Revision: 603 Log: gdl-frontend: TM Engine: updated the TopicMaps_Model.jar file Modified: branches/gdl-frontend/src/anaToMia/GDL_TmEngine/lib/GDL_TopicMaps_Model.jar Modified: branches/gdl-frontend/src/anaToMia/GDL_TmEngine/lib/GDL_TopicMaps_Model.jar ============================================================================== Binary file (source and/or target). No diff available.

1 0

[isidorus-cvs] r602 - in branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model: .gwt src/us/isidor/gdl/anaToMia/TopicMaps/TopicMapsModel
by lgiessmann＠common-lisp.net 12 Jul '11

12 Jul '11

Author: lgiessmann Date: Tue Jul 12 06:13:43 2011 New Revision: 602 Log: gdl-frontend: Topic Maps Model: added the class ScopedStub Added: branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/src/us/isidor/gdl/anaToMia/TopicMaps/TopicMapsModel/ScopedStub.java Modified: branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/.gwt/.gwt-log Modified: branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/.gwt/.gwt-log ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/.gwt/.gwt-log Tue Jul 12 01:17:14 2011 (r601) +++ branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/.gwt/.gwt-log Tue Jul 12 06:13:43 2011 (r602) @@ -1954,3 +1954,981 @@ Translatable source found in... Removing invalidated units Finding entry point classes +Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/User.gwt.xml +Loading inherited module 'com.google.gwt.canvas.Canvas' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/Canvas.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.canvas.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/Core.gwt.xml + Loading inherited module 'com.google.gwt.dev.jjs.intrinsic.Intrinsic' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/dev/jjs/intrinsic/Intrinsic.gwt.xml + Loading inherited module 'com.google.gwt.lang.LongLib' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/lang/LongLib.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/Emulation.gwt.xml + Loading inherited module 'com.google.gwt.logging.LogImpl' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/logging/LogImpl.gwt.xml + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/xhr/XMLHttpRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CompilerParameters' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CompilerParameters.gwt.xml + Loading inherited module 'com.google.gwt.core.EmulateJsStack' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/EmulateJsStack.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.AsyncFragmentLoader' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/AsyncFragmentLoader.gwt.xml + Loading inherited module 'com.google.gwt.core.XSLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/XSLinker.gwt.xml + Loading inherited module 'com.google.gwt.core.CrossSiteIframeLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml + Loading inherited module 'com.google.gwt.user.UserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/UserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.EmulationWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/EmulationWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module 'com.google.gwt.emul.Emulation' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CoreWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CoreWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.text.Text' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/text/Text.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/EventBase.gwt.xml + Loading inherited module 'com.google.web.bindery.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/web/bindery/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.DomEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/DomEvent.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.TouchEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/TouchEvent.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.logical.LogicalEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/logical/LogicalEvent.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.animation.Animation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/animation/Animation.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.editor.Editor' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/editor/Editor.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'javax.validation.Validation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/javax/validation/Validation.gwt.xml +Loading inherited module 'com.google.gwt.resources.Resources' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/resources/Resources.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.http.HTTP' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/http/HTTP.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.jsonp.Jsonp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/jsonp/Jsonp.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.layout.Layout' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/layout/Layout.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.animation.Animation' + Module 'com.google.gwt.animation.Animation' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.media.Media' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/Media.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.media.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/dom/DOM.gwt.xml +Loading inherited module 'com.google.gwt.touch.Touch' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/touch/Touch.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.uibinder.UiBinder' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/uibinder/UiBinder.gwt.xml + Loading inherited module 'com.google.gwt.resources.Resources' + Module 'com.google.gwt.resources.Resources' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.AsyncProxy' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/AsyncProxy.gwt.xml +Loading inherited module 'com.google.gwt.user.RemoteService' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RemoteService.gwt.xml + Loading inherited module 'com.google.gwt.http.HTTP' + Module 'com.google.gwt.http.HTTP' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DocumentRoot' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DocumentRoot.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Window.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.HTTPRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/HTTPRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.History' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/History.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.i18n.I18N' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/i18n/I18N.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/regexp/RegExp.gwt.xml + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safehtml/SafeHtml.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module 'com.google.gwt.regexp.RegExp' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Popup' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Popup.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Form' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Form.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.TextBox' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/TextBox.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Focus' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Focus.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ImageBundle' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ImageBundle.gwt.xml + Loading inherited module 'com.google.gwt.user.ClippedImage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ClippedImage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ClippedImage' + Module 'com.google.gwt.user.ClippedImage' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.RichText' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RichText.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.SplitPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/SplitPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.CaptionPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/CaptionPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module 'com.google.gwt.user.Window' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Tree' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Tree.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Hyperlink' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Hyperlink.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.FileUpload' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/FileUpload.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ResizeLayoutPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ResizeLayoutPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ScrollPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ScrollPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.datepicker.DatePicker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/datepicker/DatePicker.gwt.xml +Loading inherited module 'com.google.gwt.user.cellview.CellView' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/cellview/CellView.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.cell.Cell' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/cell/Cell.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.text.Text' + Module 'com.google.gwt.text.Text' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.editor.Editor' + Module 'com.google.gwt.editor.Editor' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.view.View' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/view/View.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.safecss.SafeCss' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safecss/SafeCss.gwt.xml +Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.storage.Storage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/storage/Storage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Public resources found in... + [WARN] Error processing classpath URL 'file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar' +java.net.URISyntaxException: Illegal character in path at index 16: file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar + at java.net.URI$Parser.fail(Unknown Source) + at java.net.URI$Parser.checkChars(Unknown Source) + at java.net.URI$Parser.parseHierarchical(Unknown Source) + at java.net.URI$Parser.parse(Unknown Source) + at java.net.URI.<init>(Unknown Source) + at java.net.URL.toURI(Unknown Source) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.addAllClassPathEntries(ResourceOracleImpl.java:314) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.getAllClassPathEntries(ResourceOracleImpl.java:352) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:392) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:382) + at com.google.gwt.dev.cfg.ModuleDef.normalize(ModuleDef.java:484) + at com.google.gwt.dev.cfg.ModuleDefLoader.doLoadModule(ModuleDefLoader.java:315) + at com.google.gwt.dev.cfg.ModuleDefLoader.loadFromClassPath(ModuleDefLoader.java:151) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.loadModule(HostedModeSupportImpl.java:85) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.createModuleSpaceHost(HostedModeSupportImpl.java:64) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.hosted.tdt.HostedModeSupport.createModuleSpaceHost(HostedModeSupport.java:336) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:111) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:89) + at com.google.gdt.eclipse.designer.WarmUpSupport.doWarmUp(WarmUpSupport.java:70) + at com.google.gdt.eclipse.designer.Activator.earlyStartup(Activator.java:176) + at org.eclipse.ui.internal.EarlyStartupRunnable.runEarlyStartup(EarlyStartupRunnable.java:87) + at org.eclipse.ui.internal.EarlyStartupRunnable.run(EarlyStartupRunnable.java:73) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.internal.Workbench$59.run(Workbench.java:2409) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) +Translatable source found in... +Removing invalidated units +Finding entry point classes +Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/User.gwt.xml +Loading inherited module 'com.google.gwt.canvas.Canvas' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/Canvas.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.canvas.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/Core.gwt.xml + Loading inherited module 'com.google.gwt.dev.jjs.intrinsic.Intrinsic' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/dev/jjs/intrinsic/Intrinsic.gwt.xml + Loading inherited module 'com.google.gwt.lang.LongLib' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/lang/LongLib.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/Emulation.gwt.xml + Loading inherited module 'com.google.gwt.logging.LogImpl' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/logging/LogImpl.gwt.xml + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/xhr/XMLHttpRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CompilerParameters' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CompilerParameters.gwt.xml + Loading inherited module 'com.google.gwt.core.EmulateJsStack' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/EmulateJsStack.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.AsyncFragmentLoader' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/AsyncFragmentLoader.gwt.xml + Loading inherited module 'com.google.gwt.core.XSLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/XSLinker.gwt.xml + Loading inherited module 'com.google.gwt.core.CrossSiteIframeLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml + Loading inherited module 'com.google.gwt.user.UserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/UserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.EmulationWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/EmulationWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module 'com.google.gwt.emul.Emulation' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CoreWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CoreWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.text.Text' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/text/Text.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/EventBase.gwt.xml + Loading inherited module 'com.google.web.bindery.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/web/bindery/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.DomEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/DomEvent.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.TouchEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/TouchEvent.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.logical.LogicalEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/logical/LogicalEvent.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.animation.Animation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/animation/Animation.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.editor.Editor' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/editor/Editor.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'javax.validation.Validation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/javax/validation/Validation.gwt.xml +Loading inherited module 'com.google.gwt.resources.Resources' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/resources/Resources.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.http.HTTP' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/http/HTTP.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.jsonp.Jsonp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/jsonp/Jsonp.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.layout.Layout' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/layout/Layout.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.animation.Animation' + Module 'com.google.gwt.animation.Animation' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.media.Media' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/Media.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.media.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/dom/DOM.gwt.xml +Loading inherited module 'com.google.gwt.touch.Touch' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/touch/Touch.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.uibinder.UiBinder' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/uibinder/UiBinder.gwt.xml + Loading inherited module 'com.google.gwt.resources.Resources' + Module 'com.google.gwt.resources.Resources' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.AsyncProxy' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/AsyncProxy.gwt.xml +Loading inherited module 'com.google.gwt.user.RemoteService' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RemoteService.gwt.xml + Loading inherited module 'com.google.gwt.http.HTTP' + Module 'com.google.gwt.http.HTTP' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DocumentRoot' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DocumentRoot.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Window.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.HTTPRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/HTTPRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.History' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/History.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.i18n.I18N' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/i18n/I18N.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/regexp/RegExp.gwt.xml + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safehtml/SafeHtml.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module 'com.google.gwt.regexp.RegExp' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Popup' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Popup.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Form' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Form.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.TextBox' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/TextBox.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Focus' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Focus.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ImageBundle' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ImageBundle.gwt.xml + Loading inherited module 'com.google.gwt.user.ClippedImage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ClippedImage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ClippedImage' + Module 'com.google.gwt.user.ClippedImage' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.RichText' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RichText.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.SplitPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/SplitPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.CaptionPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/CaptionPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module 'com.google.gwt.user.Window' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Tree' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Tree.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Hyperlink' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Hyperlink.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.FileUpload' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/FileUpload.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ResizeLayoutPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ResizeLayoutPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ScrollPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ScrollPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.datepicker.DatePicker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/datepicker/DatePicker.gwt.xml +Loading inherited module 'com.google.gwt.user.cellview.CellView' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/cellview/CellView.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.cell.Cell' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/cell/Cell.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.text.Text' + Module 'com.google.gwt.text.Text' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.editor.Editor' + Module 'com.google.gwt.editor.Editor' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.view.View' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/view/View.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.safecss.SafeCss' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safecss/SafeCss.gwt.xml +Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.storage.Storage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/storage/Storage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Public resources found in... + [WARN] Error processing classpath URL 'file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar' +java.net.URISyntaxException: Illegal character in path at index 16: file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar + at java.net.URI$Parser.fail(Unknown Source) + at java.net.URI$Parser.checkChars(Unknown Source) + at java.net.URI$Parser.parseHierarchical(Unknown Source) + at java.net.URI$Parser.parse(Unknown Source) + at java.net.URI.<init>(Unknown Source) + at java.net.URL.toURI(Unknown Source) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.addAllClassPathEntries(ResourceOracleImpl.java:314) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.getAllClassPathEntries(ResourceOracleImpl.java:352) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:392) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:382) + at com.google.gwt.dev.cfg.ModuleDef.normalize(ModuleDef.java:484) + at com.google.gwt.dev.cfg.ModuleDefLoader.doLoadModule(ModuleDefLoader.java:315) + at com.google.gwt.dev.cfg.ModuleDefLoader.loadFromClassPath(ModuleDefLoader.java:151) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.loadModule(HostedModeSupportImpl.java:85) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.createModuleSpaceHost(HostedModeSupportImpl.java:64) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.hosted.tdt.HostedModeSupport.createModuleSpaceHost(HostedModeSupport.java:336) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:111) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:90) + at com.google.gdt.eclipse.designer.WarmUpSupport.doWarmUp(WarmUpSupport.java:70) + at com.google.gdt.eclipse.designer.Activator.earlyStartup(Activator.java:176) + at org.eclipse.ui.internal.EarlyStartupRunnable.runEarlyStartup(EarlyStartupRunnable.java:87) + at org.eclipse.ui.internal.EarlyStartupRunnable.run(EarlyStartupRunnable.java:73) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.internal.Workbench$59.run(Workbench.java:2409) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) +Translatable source found in... +Removing invalidated units +Finding entry point classes +Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/User.gwt.xml +Loading inherited module 'com.google.gwt.canvas.Canvas' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/Canvas.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.canvas.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/canvas/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/dom/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/Core.gwt.xml + Loading inherited module 'com.google.gwt.dev.jjs.intrinsic.Intrinsic' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/dev/jjs/intrinsic/Intrinsic.gwt.xml + Loading inherited module 'com.google.gwt.lang.LongLib' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-dev.jar!/com/google/gwt/lang/LongLib.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/Emulation.gwt.xml + Loading inherited module 'com.google.gwt.logging.LogImpl' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/logging/LogImpl.gwt.xml + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/xhr/XMLHttpRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CompilerParameters' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CompilerParameters.gwt.xml + Loading inherited module 'com.google.gwt.core.EmulateJsStack' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/EmulateJsStack.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.AsyncFragmentLoader' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/AsyncFragmentLoader.gwt.xml + Loading inherited module 'com.google.gwt.core.XSLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/XSLinker.gwt.xml + Loading inherited module 'com.google.gwt.core.CrossSiteIframeLinker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CrossSiteIframeLinker.gwt.xml + Loading inherited module 'com.google.gwt.user.UserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/UserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.EmulationWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/emul/EmulationWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.emul.Emulation' + Module 'com.google.gwt.emul.Emulation' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.core.CoreWithUserAgent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/core/CoreWithUserAgent.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.text.Text' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/text/Text.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/EventBase.gwt.xml + Loading inherited module 'com.google.web.bindery.event.Event' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/web/bindery/event/Event.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.DomEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/DomEvent.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.dom.TouchEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/dom/TouchEvent.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.event.logical.LogicalEvent' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/event/logical/LogicalEvent.gwt.xml + Loading inherited module 'com.google.gwt.event.EventBase' + Module 'com.google.gwt.event.EventBase' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.animation.Animation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/animation/Animation.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.editor.Editor' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/editor/Editor.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'javax.validation.Validation' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/javax/validation/Validation.gwt.xml +Loading inherited module 'com.google.gwt.resources.Resources' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/resources/Resources.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.http.HTTP' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/http/HTTP.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.jsonp.Jsonp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/jsonp/Jsonp.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.layout.Layout' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/layout/Layout.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.animation.Animation' + Module 'com.google.gwt.animation.Animation' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.media.Media' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/Media.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.media.dom.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/media/dom/DOM.gwt.xml +Loading inherited module 'com.google.gwt.touch.Touch' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/touch/Touch.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.uibinder.UiBinder' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/uibinder/UiBinder.gwt.xml + Loading inherited module 'com.google.gwt.resources.Resources' + Module 'com.google.gwt.resources.Resources' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.AsyncProxy' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/AsyncProxy.gwt.xml +Loading inherited module 'com.google.gwt.user.RemoteService' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RemoteService.gwt.xml + Loading inherited module 'com.google.gwt.http.HTTP' + Module 'com.google.gwt.http.HTTP' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DocumentRoot' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DocumentRoot.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.DOM' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/DOM.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Window.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.HTTPRequest' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/HTTPRequest.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.xhr.XMLHttpRequest' + Module 'com.google.gwt.xhr.XMLHttpRequest' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.History' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/History.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.i18n.I18N' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/i18n/I18N.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/regexp/RegExp.gwt.xml + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safehtml/SafeHtml.gwt.xml + Loading inherited module 'com.google.gwt.regexp.RegExp' + Module 'com.google.gwt.regexp.RegExp' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Popup' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Popup.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Form' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Form.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.TextBox' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/TextBox.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Focus' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Focus.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ImageBundle' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ImageBundle.gwt.xml + Loading inherited module 'com.google.gwt.user.ClippedImage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ClippedImage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ClippedImage' + Module 'com.google.gwt.user.ClippedImage' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.RichText' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/RichText.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.SplitPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/SplitPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.CaptionPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/CaptionPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Window' + Module 'com.google.gwt.user.Window' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Tree' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Tree.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.Hyperlink' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/Hyperlink.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.FileUpload' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/FileUpload.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ResizeLayoutPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ResizeLayoutPanel.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.ScrollPanel' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/ScrollPanel.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.user.datepicker.DatePicker' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/datepicker/DatePicker.gwt.xml +Loading inherited module 'com.google.gwt.user.cellview.CellView' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/user/cellview/CellView.gwt.xml + Loading inherited module 'com.google.gwt.user.User' + Module 'com.google.gwt.user.User' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.cell.Cell' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/cell/Cell.gwt.xml + Loading inherited module 'com.google.gwt.dom.DOM' + Module 'com.google.gwt.dom.DOM' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.text.Text' + Module 'com.google.gwt.text.Text' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.editor.Editor' + Module 'com.google.gwt.editor.Editor' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.view.View' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/view/View.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.safecss.SafeCss' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/safecss/SafeCss.gwt.xml +Loading inherited module 'com.google.gwt.safehtml.SafeHtml' + Module 'com.google.gwt.safehtml.SafeHtml' has already been loaded and will be skipped +Loading inherited module 'com.google.gwt.storage.Storage' + Module location: jar:file:/C:/Program%20Files/eclipse/plugins/com.google.gwt.eclipse.sdkbundle_2.3.0.r36v201105191508/gwt-2.3.0/gwt-user.jar!/com/google/gwt/storage/Storage.gwt.xml + Loading inherited module 'com.google.gwt.core.Core' + Module 'com.google.gwt.core.Core' has already been loaded and will be skipped + Loading inherited module 'com.google.gwt.user.UserAgent' + Module 'com.google.gwt.user.UserAgent' has already been loaded and will be skipped +Public resources found in... + [WARN] Error processing classpath URL 'file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar' +java.net.URISyntaxException: Illegal character in path at index 16: file:/C:/Program Files/eclipse/plugins/com.google.gdt.eclipse.designer.hosted.2_2_2.3.2.r36x201106161421/gwt-dev-designtime.jar + at java.net.URI$Parser.fail(Unknown Source) + at java.net.URI$Parser.checkChars(Unknown Source) + at java.net.URI$Parser.parseHierarchical(Unknown Source) + at java.net.URI$Parser.parse(Unknown Source) + at java.net.URI.<init>(Unknown Source) + at java.net.URL.toURI(Unknown Source) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.addAllClassPathEntries(ResourceOracleImpl.java:314) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.getAllClassPathEntries(ResourceOracleImpl.java:352) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:392) + at com.google.gwt.dev.resource.impl.ResourceOracleImpl.<init>(ResourceOracleImpl.java:382) + at com.google.gwt.dev.cfg.ModuleDef.normalize(ModuleDef.java:484) + at com.google.gwt.dev.cfg.ModuleDefLoader.doLoadModule(ModuleDefLoader.java:315) + at com.google.gwt.dev.cfg.ModuleDefLoader.loadFromClassPath(ModuleDefLoader.java:151) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.loadModule(HostedModeSupportImpl.java:85) + at com.google.gwt.dev.shell.designtime.HostedModeSupportImpl.createModuleSpaceHost(HostedModeSupportImpl.java:64) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.hosted.tdt.HostedModeSupport.createModuleSpaceHost(HostedModeSupport.java:336) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.eclipse.wb.internal.core.utils.reflect.ReflectionUtils.invokeMethod(ReflectionUtils.java:836) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:111) + at com.google.gdt.eclipse.designer.WarmUpSupport.warmUpHostedMode(WarmUpSupport.java:91) + at com.google.gdt.eclipse.designer.WarmUpSupport.doWarmUp(WarmUpSupport.java:70) + at com.google.gdt.eclipse.designer.Activator.earlyStartup(Activator.java:176) + at org.eclipse.ui.internal.EarlyStartupRunnable.runEarlyStartup(EarlyStartupRunnable.java:87) + at org.eclipse.ui.internal.EarlyStartupRunnable.run(EarlyStartupRunnable.java:73) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.internal.Workbench$59.run(Workbench.java:2409) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54) +Translatable source found in... +Removing invalidated units +Finding entry point classes Added: branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/src/us/isidor/gdl/anaToMia/TopicMaps/TopicMapsModel/ScopedStub.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/gdl-frontend/src/anaToMia/GDL_TopicMaps_Model/src/us/isidor/gdl/anaToMia/TopicMaps/TopicMapsModel/ScopedStub.java Tue Jul 12 06:13:43 2011 (r602) @@ -0,0 +1,58 @@ +package us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel; + +import com.google.gwt.core.client.JavaScriptObject; +import com.google.gwt.core.client.JsArray; + +public class ScopedStub extends JavaScriptObject implements Scoped { + protected ScopedStub() {} + + + public final native String getId() /*-{ + return this.getId() + ""; + }-*/; + + + public final native void addItemIdentifier(Locator itemIdentifier) /*-{ + this.addItemIdentifier(itemIdentifier); + }-*/; + + + public final native JsArray<Locator> getItemIdentifiers() /*-{ + return this.getItemIdentifiers(); + }-*/; + + + public final native TopicMap getParent() /*-{ + return this.getParent(); + }-*/; + + + public final native TopicMap getTopicMap() /*-{ + return this.getTopicMap(); + }-*/; + + + public final native void remove() /*-{ + this.remove(); + }-*/; + + + public final native void removeItemIdentifier(Locator itemIdentifier) /*-{ + this.removeItemIdentifier(itemIdentifier); + }-*/; + + + public final native void addTheme(Topic theme) /*-{ + this.addTheme(theme); + }-*/; + + + public final native void removeTheme(Topic theme) /*-{ + this.removeTheme(theme); + }-*/; + + + public final native JsArray<Topic> getScope() /*-{ + return this.getScope(); + }-*/; +}

1 0

[isidorus-cvs] r601 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base environment
by lgiessmann＠common-lisp.net 12 Jul '11

12 Jul '11

Author: lgiessmann Date: Tue Jul 12 01:17:14 2011 New Revision: 601 Log: gdl-frontend: Widgets: started to implement the entry point 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/environment/GdlInstantiator.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 Jul 11 23:53:15 2011 (r600) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Tue Jul 12 01:17:14 2011 (r601) @@ -281,6 +281,9 @@ public void createView(){ try{ // TODO: Implement + // search for an instance of default-[editor|creator]-topic-view (only one of those must be existent) + // use gdl instaiator + for (Pair<ClickHandler, String> item : this.buttonCallbacks) { view.registerButtonCallback(item.getFirst(), item.getSecond()); 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 Mon Jul 11 23:53:15 2011 (r600) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Tue Jul 12 01:17:14 2011 (r601) @@ -31,6 +31,7 @@ import us.isidor.gdl.anaToMia.Widgets.view.GdlCreatorAssociationView; import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultCreatorTopicView; import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultEditorTopicView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultTopicView; import us.isidor.gdl.anaToMia.Widgets.view.GdlEditorAssociationView; import us.isidor.gdl.anaToMia.Widgets.view.GdlSpecialCreatorTopicView; import us.isidor.gdl.anaToMia.Widgets.view.GdlSpecialEditorTopicView; @@ -131,4 +132,21 @@ throw new InvalidGdlSchemaException("the topic " + GdlPsis.getAnyIdOfTopic(tmRepresentative) + " is an instance of an unsupported visible topic type or an abstract topic type: " + values); } } + + + public static GdlDefaultTopicView instantiateDefaultEditorOrCreatorView(TopicMap tm) throws InvalidGdlSchemaException, ExecutionException{ + if(tm == null) return null; + + Topic defaultCreatorTopicView = getTopicByPsi(GdlPsis.TopicType.gdlDefaultCreatorTopicView, tm); + Topic defaultEditorTopicView = getTopicByPsi(GdlPsis.TopicType.gdlDefaultEditorTopicView, tm); + if(defaultCreatorTopicView == null && defaultEditorTopicView == null){ + throw new InvalidGdlSchemaException("the requested GDL schema does not have an entry point defined, either an instance of " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " or " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " is necessary"); + }else { + // search for an instance of either dctv or detv + } + return null; // TODO: remove + + // throw new InvalidGdlSchemaException("the requested GDL schema does not have an entry point defined, either an instance of " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " or " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " is necessary"); + // throw new InvalidGdlSchemaException("the requested GDL schema does have multiple entry points defined, only an instance of " + GdlPsis.TopicType.gdlDefaultCreatorTopicView + " or " + GdlPsis.TopicType.gdlDefaultEditorTopicView + " is permitted"); + } }

1 0

[isidorus-cvs] r600 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: . base button complexData container environment text value values view views
by lgiessmann＠common-lisp.net 12 Jul '11

12 Jul '11

Author: lgiessmann Date: Mon Jul 11 23:53:15 2011 New Revision: 600 Log: gdl-frontend: Widgets: implemented stub-widgets for all buttons, GdlLineBreak (stub), and GdlInfo(Stub); implemented the method GdlInstantiator.instantiate(Topic tmRepresentative), which creates a corresponding java instance of a passed topic Added: 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/button/GdlActionButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlButton.java - copied, changed from r599, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/Button.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/GdlCommitButton.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.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/button/GdlValidateButton.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/value/ - copied from r599, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/ - copied from r599, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/ Deleted: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/Button.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml 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/GdlPsis.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/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/GdlTimePicker.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/environment/GdlInstantiator.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/GdlTextObject.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/value/AbsoluteNumValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/AutoNumUnitValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/AutoNumValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/BorderStyleValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ClearValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ColorValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ContentOrientationValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/CssValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/CursorValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/DirectionValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/FontWeightValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/HtmlValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ListStylePositionValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ListStyleTypeValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/NormalNumUnitValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/NumUnitValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/PositiveNumUnitValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ResizeValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextAlignValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextDecorationValue.java branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextTypeValue.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/GdlSpecialTopicView.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/GDL_Widgets.gwt.xml ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/GDL_Widgets.gwt.xml Mon Jul 11 23:53:15 2011 (r600) @@ -20,11 +20,11 @@  <source path="base"/> - <source path="views"/> + <source path="view"/> <source path="text"/> <source path="container"/> <source path="environment"/> - <source path="values"/> + <source path="value"/> <source path="isidorus"/> <source path="complexData"/> <source path="button"/> Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlLineBreak.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/GdlLineBreak.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,19 @@ +package us.isidor.gdl.anaToMia.Widgets.base; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlLineBreak extends GdlVisibleObject { + // TODO: implement + + // some constructors + protected GdlLineBreak() throws InvalidGdlSchemaException, ExecutionException { + super(); + } + + + public GdlLineBreak(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +} 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPanel.java Mon Jul 11 23:53:15 2011 (r600) @@ -12,7 +12,8 @@ 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.views.GdlDefaultTopicView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultTopicView; + import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.ui.AbsolutePanel; import com.google.gwt.user.client.ui.Composite; 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 Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlPsis.java Mon Jul 11 23:53:15 2011 (r600) @@ -14,7 +14,7 @@ public final static String gdlEditorAssociationView = gdl + "Editor-Association-View"; public final static String gdlTopicView = gdl + "Topic-View"; public final static String gdlDefaultTopicView = gdl + "Default-Topic-View"; - public final static String gdlDefaulCreatorTopicView = gdl + "Default-Creator-Topic-View"; + public final static String gdlDefaultCreatorTopicView = gdl + "Default-Creator-Topic-View"; public final static String gdlDefaultEditorTopicView = gdl + "Default-Editor-Topic-View"; public final static String gdlSpecialTopicView = gdl + "Special-Topic-View"; public final static String gdlSpecialCreatorTopicView = gdl + "Special-Creator-TopicView"; 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java Mon Jul 11 23:53:15 2011 (r600) @@ -12,15 +12,16 @@ import us.isidor.gdl.anaToMia.Widgets.environment.MultipleHandlerRegistration; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.environment.Pattern; -import us.isidor.gdl.anaToMia.Widgets.values.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.AutoNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.values.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.ContentOrientationValue; -import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; +import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; +import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; + import com.google.gwt.core.client.JsArray; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Style.Display; 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/TestClass.java Mon Jul 11 23:53:15 2011 (r600) @@ -13,8 +13,8 @@ import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.environment.Pair; import us.isidor.gdl.anaToMia.Widgets.isidorus.LoadSchemaCallback; -import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.views.GdlView; +import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; +import us.isidor.gdl.anaToMia.Widgets.view.GdlView; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.event.dom.client.ClickEvent; Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlActionButton.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/button/GdlActionButton.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,18 @@ +package us.isidor.gdl.anaToMia.Widgets.button; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlActionButton extends GdlButton { + // TODO: implement + + protected GdlActionButton(){ + super(); + } + + + public GdlActionButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +} Copied and modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlButton.java (from r599, branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/Button.java) ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/Button.java Mon Jul 11 08:17:54 2011 (r599, copy source) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlButton.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,7 +1,19 @@ package us.isidor.gdl.anaToMia.Widgets.button; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; import us.isidor.gdl.anaToMia.Widgets.text.GdlTextObject; -public abstract class Button extends GdlTextObject { +public abstract class GdlButton extends GdlTextObject { // TODO: implement + + protected GdlButton(){ + super(); + } + + + public GdlButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } } Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCheckBox.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/button/GdlCheckBox.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,18 @@ +package us.isidor.gdl.anaToMia.Widgets.button; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlCheckBox extends GdlButton { + // TODO: implement + + protected GdlCheckBox(){ + super(); + } + + + public GdlCheckBox(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +} Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCommitButton.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/button/GdlCommitButton.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,18 @@ +package us.isidor.gdl.anaToMia.Widgets.button; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlCommitButton extends GdlActionButton { + // TODO: implement + + protected GdlCommitButton(){ + super(); + } + + + public GdlCommitButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +} Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlCreateButton.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/button/GdlCreateButton.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,18 @@ +package us.isidor.gdl.anaToMia.Widgets.button; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlCreateButton extends GdlActionButton { + // TODO: implement + + protected GdlCreateButton(){ + super(); + } + + + public GdlCreateButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +} Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlDeleteButton.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/button/GdlDeleteButton.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,18 @@ +package us.isidor.gdl.anaToMia.Widgets.button; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlDeleteButton extends GdlActionButton { + // TODO: implement + + protected GdlDeleteButton(){ + super(); + } + + + public GdlDeleteButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +} Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlRadioButton.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/button/GdlRadioButton.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,18 @@ +package us.isidor.gdl.anaToMia.Widgets.button; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlRadioButton extends GdlButton { + // TODO: implement + + protected GdlRadioButton(){ + super(); + } + + + public GdlRadioButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +} Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/button/GdlValidateButton.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/button/GdlValidateButton.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,18 @@ +package us.isidor.gdl.anaToMia.Widgets.button; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlValidateButton extends GdlActionButton { + // TODO: implement + + protected GdlValidateButton(){ + super(); + } + + + public GdlValidateButton(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + } +} 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlAudio.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,7 +1,5 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; -import org.apache.commons.lang.NotImplementedException; - import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.base.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDatePicker.java Mon Jul 11 23:53:15 2011 (r600) @@ -22,7 +22,6 @@ import com.google.gwt.event.dom.client.MouseUpHandler; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.datepicker.client.DatePicker; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.TopicMapsTypes; 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlDateTimePicker.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,6 +1,21 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + public class GdlDateTimePicker extends GdlComplexData { // TODO: implement - + + + // some constructors + protected GdlDateTimePicker(){ + super(); + } + + + public GdlDateTimePicker(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + // create a date-time widget for each tm-construct + } } 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/complexData/GdlTimePicker.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,5 +1,21 @@ package us.isidor.gdl.anaToMia.Widgets.complexData; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + public class GdlTimePicker extends GdlComplexData { // TODO: implement + + + // some constructors + protected GdlTimePicker(){ + super(); + } + + + public GdlTimePicker(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + // create a time widget for each tm-construct + } } 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlList.java Mon Jul 11 23:53:15 2011 (r600) @@ -36,8 +36,8 @@ 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.values.ListStylePositionValue; -import us.isidor.gdl.anaToMia.Widgets.values.ListStyleTypeValue; +import us.isidor.gdl.anaToMia.Widgets.value.ListStylePositionValue; +import us.isidor.gdl.anaToMia.Widgets.value.ListStyleTypeValue; public class GdlList extends GdlVisibleObject{ 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/container/GdlUnit.java Mon Jul 11 23:53:15 2011 (r600) @@ -38,12 +38,12 @@ 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.values.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.TextDecorationValue; +import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; public class GdlUnit extends GdlTextObject implements IGdlContainer { 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 Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/environment/GdlInstantiator.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,12 +1,134 @@ package us.isidor.gdl.anaToMia.Widgets.environment; + +import com.google.gwt.core.client.JsArray; +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Locator; 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.GdlPsis; import us.isidor.gdl.anaToMia.Widgets.base.GdlVisibleObject; +import us.isidor.gdl.anaToMia.Widgets.button.GdlActionButton; +import us.isidor.gdl.anaToMia.Widgets.button.GdlCheckBox; +import us.isidor.gdl.anaToMia.Widgets.button.GdlCommitButton; +import us.isidor.gdl.anaToMia.Widgets.button.GdlCreateButton; +import us.isidor.gdl.anaToMia.Widgets.button.GdlDeleteButton; +import us.isidor.gdl.anaToMia.Widgets.button.GdlRadioButton; +import us.isidor.gdl.anaToMia.Widgets.button.GdlValidateButton; +import us.isidor.gdl.anaToMia.Widgets.complexData.GdlAudio; +import us.isidor.gdl.anaToMia.Widgets.complexData.GdlDatePicker; +import us.isidor.gdl.anaToMia.Widgets.complexData.GdlDateTimePicker; +import us.isidor.gdl.anaToMia.Widgets.complexData.GdlImage; +import us.isidor.gdl.anaToMia.Widgets.complexData.GdlTimePicker; +import us.isidor.gdl.anaToMia.Widgets.complexData.GdlVideo; +import us.isidor.gdl.anaToMia.Widgets.container.GdlList; +import us.isidor.gdl.anaToMia.Widgets.container.GdlUnit; +import us.isidor.gdl.anaToMia.Widgets.text.GdlInfo; +import us.isidor.gdl.anaToMia.Widgets.text.GdlListBox; +import us.isidor.gdl.anaToMia.Widgets.text.GdlReference; +import us.isidor.gdl.anaToMia.Widgets.text.GdlText; +import us.isidor.gdl.anaToMia.Widgets.text.GdlTitle; +import us.isidor.gdl.anaToMia.Widgets.view.GdlCreatorAssociationView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultCreatorTopicView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlDefaultEditorTopicView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlEditorAssociationView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlSpecialCreatorTopicView; +import us.isidor.gdl.anaToMia.Widgets.view.GdlSpecialEditorTopicView; + public class GdlInstantiator { - public static GdlVisibleObject createJavaInstance(Topic tmRepresentative) throws InvalidGdlSchemaException{ + // a helper that returns the topic bound to the identifier via a subject identifier + private static Topic getTopicByPsi(String subjectIdentifier, TopicMap tm){ + if(subjectIdentifier == null || tm == null) return null; + Locator loc = tm.createLocator(subjectIdentifier); + return tm.getTopicBySubjectIdentifier(loc); + } + + + // returns true if the passed topic instance is a subtype of the topic bound to the passed + // type subjectIdenifier; the instance must have only one type, otherwise the result is false + private static boolean isInstanceOf(Topic instance, String typeSubjectIdentifier){ + TopicMap tm = instance.getTopicMap(); - return null; + JsArray<Topic> types = instance.getTypes(); + if(types.length() != 1){ + return false; + }else{ + Topic type = getTopicByPsi(typeSubjectIdentifier, tm); + if(type == null) return false; + else return types.get(0).equals(type); + } + } + + + // 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(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlLineBreak)){ + return new GdlLineBreak(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlInfo)){ + return new GdlInfo(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTitle)){ + return new GdlTitle(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlReference)){ + return new GdlReference(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlRadioButton)){ + return new GdlRadioButton(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCheckBox)){ + return new GdlCheckBox(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlActionButton)){ + return new GdlActionButton(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlValidateButton)){ + return new GdlValidateButton(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreateButton)){ + return new GdlCreateButton(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDeleteButton)){ + return new GdlDeleteButton(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCommitButton)){ + return new GdlCommitButton(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlImage)){ + return new GdlImage(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlVideo)){ + return new GdlVideo(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlAudio)){ + return new GdlAudio(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDatePicker)){ + return new GdlDatePicker(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlTimePicker)){ + return new GdlTimePicker(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDateTimePicker)){ + return new GdlDateTimePicker(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlUnit)){ + return new GdlUnit(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlText)){ + return new GdlText(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlList)){ + return new GdlList(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlListBox)){ + return new GdlListBox(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultCreatorTopicView)){ + return new GdlDefaultCreatorTopicView(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlDefaultEditorTopicView)){ + return new GdlDefaultEditorTopicView(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialCreatorTopicView)){ + return new GdlSpecialCreatorTopicView(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlSpecialEditorTopicView)){ + return new GdlSpecialEditorTopicView(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlCreatorAssociationview)){ + return new GdlCreatorAssociationView(tmRepresentative); + }else if(isInstanceOf(tmRepresentative, GdlPsis.TopicType.gdlEditorAssociationView)){ + return new GdlEditorAssociationView(tmRepresentative); + }else{ + String values = ""; + for(int i = 0; i != tmRepresentative.getTypes().length(); ++i){ + if(i != tmRepresentative.getTypes().length() - 1){ + values += GdlPsis.getAnyIdOfTopic(tmRepresentative.getTypes().get(i)) + ", "; + }else { + values += GdlPsis.getAnyIdOfTopic(tmRepresentative.getTypes().get(i)); + } + } + throw new InvalidGdlSchemaException("the topic " + GdlPsis.getAnyIdOfTopic(tmRepresentative) + " is an instance of an unsupported visible topic type or an abstract topic type: " + values); + } } } Added: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlInfo.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/text/GdlInfo.java Mon Jul 11 23:53:15 2011 (r600) @@ -0,0 +1,19 @@ +package us.isidor.gdl.anaToMia.Widgets.text; + +import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; +import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; +import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; + +public class GdlInfo extends GdlTextObject { + // TODO: implement + + protected GdlInfo() throws InvalidGdlSchemaException, ExecutionException { + super(); + } + + + public GdlInfo(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ + super(tmRepresentative); + // TODO: create an info element for each TM-elem + } +} 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlListBox.java Mon Jul 11 23:53:15 2011 (r600) @@ -30,23 +30,7 @@ public GdlListBox(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{ super(tmRepresentative); // TODO: create a ListBox element for each TM-elem - ListBox lb = this.createNewListBox(); // TODO: remove only for debugging - lb.addItem("value-1", Direction.LTR); - lb.addItem("value-2", Direction.LTR); - lb.addItem("value-3", Direction.LTR); - lb.addItem("value-4", Direction.LTR); - lb.addItem("value-5", Direction.LTR); - lb.addItem("value-6", Direction.LTR); - lb.addItem("value-1", Direction.LTR); - lb.addItem("value-2", Direction.LTR); - lb.addItem("value-3", Direction.LTR); - lb.addItem("value-4", Direction.LTR); - lb.addItem("value-5", Direction.LTR); - lb.addItem("value-6", Direction.LTR); - lb = this.createNewListBox(); // TODO: remove only for debugging - lb.addItem("value-1", Direction.LTR); - lb.addItem("value-2", Direction.LTR); - lb.addItem("value-3", Direction.LTR); + this.createNewListBox(); } 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlReference.java Mon Jul 11 23:53:15 2011 (r600) @@ -25,9 +25,9 @@ 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.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.values.TextDecorationValue; +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{ 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java Mon Jul 11 23:53:15 2011 (r600) @@ -24,12 +24,12 @@ 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.values.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.ResizeValue; -import us.isidor.gdl.anaToMia.Widgets.values.TextTypeValue; +import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.ResizeValue; +import us.isidor.gdl.anaToMia.Widgets.value.TextTypeValue; 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 Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java Mon Jul 11 23:53:15 2011 (r600) @@ -8,13 +8,13 @@ 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.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.DirectionValue; -import us.isidor.gdl.anaToMia.Widgets.values.FontWeightValue; -import us.isidor.gdl.anaToMia.Widgets.values.NormalNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.PositiveNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.TextAlignValue; -import us.isidor.gdl.anaToMia.Widgets.values.TextDecorationValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.DirectionValue; +import us.isidor.gdl.anaToMia.Widgets.value.FontWeightValue; +import us.isidor.gdl.anaToMia.Widgets.value.NormalNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.PositiveNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.TextAlignValue; +import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; public abstract class GdlTextObject extends GdlVisibleObject { 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 Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTitle.java Mon Jul 11 23:53:15 2011 (r600) @@ -12,14 +12,15 @@ 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.values.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.DirectionValue; -import us.isidor.gdl.anaToMia.Widgets.values.FontWeightValue; -import us.isidor.gdl.anaToMia.Widgets.values.NormalNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.PositiveNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.TextAlignValue; -import us.isidor.gdl.anaToMia.Widgets.values.TextDecorationValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.DirectionValue; +import us.isidor.gdl.anaToMia.Widgets.value.FontWeightValue; +import us.isidor.gdl.anaToMia.Widgets.value.NormalNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.PositiveNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.TextAlignValue; +import us.isidor.gdl.anaToMia.Widgets.value.TextDecorationValue; + import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.Style.FontStyle; import com.google.gwt.event.dom.client.BlurEvent; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/AbsoluteNumValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/AbsoluteNumValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/AbsoluteNumValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/AutoNumUnitValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/AutoNumUnitValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/AutoNumUnitValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/AutoNumValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/AutoNumValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/AutoNumValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/BorderStyleValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/BorderStyleValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/BorderStyleValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum BorderStyleValue implements CssValue{ NONE, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ClearValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/ClearValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ClearValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum ClearValue implements CssValue{ NONE, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ColorValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/ColorValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ColorValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ContentOrientationValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/ContentOrientationValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ContentOrientationValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum ContentOrientationValue implements CssValue{ HORIZONTAL, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/CssValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/CssValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/CssValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public interface CssValue { public String getCssValue(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/CursorValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/CursorValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/CursorValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum CursorValue implements CssValue{ AUTO, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/DirectionValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/DirectionValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/DirectionValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum DirectionValue implements CssValue { LTR, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/FontWeightValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/FontWeightValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/FontWeightValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum FontWeightValue implements CssValue { NORMAL, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/HtmlValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/HtmlValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/HtmlValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public interface HtmlValue { public String getHtmlValue(); Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ListStylePositionValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/ListStylePositionValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ListStylePositionValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum ListStylePositionValue implements CssValue { INSIDE, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ListStyleTypeValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/ListStyleTypeValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ListStyleTypeValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum ListStyleTypeValue implements CssValue{ DECIMAL, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/NormalNumUnitValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/NormalNumUnitValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/NormalNumUnitValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/NumUnitValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/NumUnitValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/NumUnitValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/PositiveNumUnitValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/PositiveNumUnitValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/PositiveNumUnitValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; import us.isidor.gdl.anaToMia.Widgets.environment.InvalidGdlSchemaException; Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ResizeValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/ResizeValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/ResizeValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum ResizeValue implements CssValue { BOTH, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextAlignValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/TextAlignValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextAlignValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum TextAlignValue implements CssValue{ LEFT, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextDecorationValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/TextDecorationValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextDecorationValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum TextDecorationValue implements CssValue { UNDERLINE, Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextTypeValue.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/values/TextTypeValue.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/value/TextTypeValue.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.values; +package us.isidor.gdl.anaToMia.Widgets.value; public enum TextTypeValue implements HtmlValue{ Text, 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/views/GdlAssociationView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlAssociationView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; 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/views/GdlCreatorAssociationView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlCreatorAssociationView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; @@ -26,14 +26,14 @@ 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.values.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.values.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.ContentOrientationValue; -import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; +import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; +import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlCreatorAssociationView extends GdlAssociationView { 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/views/GdlDefaultCreatorTopicView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultCreatorTopicView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; @@ -21,14 +21,14 @@ 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.values.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.values.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.ContentOrientationValue; -import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.ContentOrientationValue; +import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; +import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlDefaultCreatorTopicView extends GdlDefaultTopicView{ 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/views/GdlDefaultEditorTopicView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultEditorTopicView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,16 +1,20 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; + +import java.util.ArrayList; import com.google.gwt.event.dom.client.ClickHandler; 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.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 GdlDefaultEditorTopicView extends GdlDefaultTopicView { +public class GdlDefaultEditorTopicView extends GdlDefaultTopicView { public GdlDefaultEditorTopicView(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException { super(tmRepresentative); @@ -49,6 +53,20 @@ // TODO Auto-generated method stub } + + + @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/GdlDefaultTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlDefaultTopicView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlDefaultTopicView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; 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/views/GdlEditorAssociationView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlEditorAssociationView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; @@ -26,13 +26,13 @@ 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.values.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.values.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; +import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlEditorAssociationView extends GdlAssociationView { 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/views/GdlSpecialCreatorTopicView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialCreatorTopicView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; @@ -25,13 +25,13 @@ 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.values.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.values.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; +import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlSpecialCreatorTopicView extends GdlSpecialTopicView{ // TODO: implement 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/views/GdlSpecialEditorTopicView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialEditorTopicView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList; @@ -25,13 +25,13 @@ 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.values.AbsoluteNumValue; -import us.isidor.gdl.anaToMia.Widgets.values.AutoNumUnitValue; -import us.isidor.gdl.anaToMia.Widgets.values.BorderStyleValue; -import us.isidor.gdl.anaToMia.Widgets.values.ClearValue; -import us.isidor.gdl.anaToMia.Widgets.values.ColorValue; -import us.isidor.gdl.anaToMia.Widgets.values.CursorValue; -import us.isidor.gdl.anaToMia.Widgets.values.NumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.AbsoluteNumValue; +import us.isidor.gdl.anaToMia.Widgets.value.AutoNumUnitValue; +import us.isidor.gdl.anaToMia.Widgets.value.BorderStyleValue; +import us.isidor.gdl.anaToMia.Widgets.value.ClearValue; +import us.isidor.gdl.anaToMia.Widgets.value.ColorValue; +import us.isidor.gdl.anaToMia.Widgets.value.CursorValue; +import us.isidor.gdl.anaToMia.Widgets.value.NumUnitValue; public class GdlSpecialEditorTopicView extends GdlSpecialTopicView{ Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialTopicView.java ============================================================================== --- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/views/GdlSpecialTopicView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlSpecialTopicView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; 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/views/GdlTopicView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlTopicView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic; import us.isidor.gdl.anaToMia.Widgets.environment.ExecutionException; 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/views/GdlView.java Mon Jul 11 08:17:54 2011 (r599) +++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/view/GdlView.java Mon Jul 11 23:53:15 2011 (r600) @@ -1,4 +1,4 @@ -package us.isidor.gdl.anaToMia.Widgets.views; +package us.isidor.gdl.anaToMia.Widgets.view; import java.util.ArrayList;

1 0

Jump to page: