Index: topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java diff -u topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java:1.6 topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java:1.7 --- topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java:1.6 Wed Sep 22 15:46:30 2004 +++ topia/src/java/org/codelutin/topia/generators/ui/swing/ObjectModelToEntityAttributesPanel.java Fri Sep 24 15:11:42 2004 @@ -23,9 +23,9 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.6 $ + * @version $Revision: 1.7 $ * - * Mise a jour: $Date: 2004/09/22 15:46:30 $ + * Mise a jour: $Date: 2004/09/24 15:11:42 $ * par : $Author: mazelier $ */ @@ -38,6 +38,7 @@ import org.codelutin.generator.Generator; import org.codelutin.generator.AbstractObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModelClass; +import org.codelutin.generator.models.object.ObjectModelClassifier; import org.codelutin.generator.models.object.ObjectModelAttribute; import org.codelutin.topia.generators.ui.Util; @@ -79,32 +80,64 @@ package <%=clazz.getPackageName()%>.ui; import org.codelutin.topia.TopiaContext; +import javax.swing.JFrame; public class <%=capitalizeName(clazz)%>AttributesPanelPanel extends <%=capitalizeName(clazz)%>AttributesPanelUI { + protected JFrame popup = null; + public <%=capitalizeName(clazz)%>AttributesPanelPanel(){ super(); init(); + popup = new JFrame(); + popup.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + popup.pack(); } public <%=capitalizeName(clazz)%>AttributesPanelPanel(TopiaContext context){ super(); setContext(context); init(); + popup = new JFrame(); + popup.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + popup.pack(); } }*/ for(Iterator i=clazz.getAttributes().iterator(); i.hasNext();) { - ObjectModelAttribute att = (ObjectModelAttribute)i.next(); + ObjectModelAttribute att = (ObjectModelAttribute)i.next(); + if(att.referenceClassifier()){ + + if (att.getMaxMultiplicity()>1 || att.getMaxMultiplicity()==-1){ + ObjectModelAttribute attRev = att.getReverseAttribute(); + if(attRev!=null){ + String attRevClazzName = attRev.getClassifier().getName(); /*{ public void on_add<%=capitalizeName(att)%>Entities(){ - // TODO a implanter - System.out.println("on_add<%=capitalizeName(att)%>Entities"); - + System.out.println("********<%=attRevClazzName%>********"); + popup.removeAll(); + popup.getContentPane().add(new <%=attRevClazzName%>SelectionPanel()); + popup.setVisible(true); + } +}*/ + } + }else if (att.getMaxMultiplicity()==1){ + ObjectModelAttribute attRev = att.getReverseAttribute(); + if(attRev!=null){ + String attRevClazzName = attRev.getClassifier().getName(); +/*{ + public void on_add<%=capitalizeName(att)%>Entities(){ + System.out.println("********<%=attRevClazzName%>********"); + popup.removeAll(); + popup.getContentPane().add(new <%=attRevClazzName%>AttributesPanelPanel()); + popup.setVisible(true); } }*/ + } + } + } } /*{ }