Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
latest updates to UIGU. see my September 2012 log for a description 
git-svn-id: http://umple.googlecode.com/svn/trunk@2003 6ebf9d09-8eb1-0036-9d08-68c07d1b990a
  • Loading branch information
@ali-fatolahi
ali-fatolahi committed Sep 7, 2012
1 parent c6c0dd4 commit aace2ed
Show file tree
Hide file tree
Showing 49 changed files with 2,646 additions and 1,256 deletions.
6 changes: 3 additions & 3 deletions UmpleUIGenerator/src/cruise/data/impl/dao/factory/FakeDAOFactory.java
View file
Expand Up @@ -180,7 +180,7 @@ public String generate(Object argument)
stringBuffer.append(TEXT_27);
for (AssociationVariable assocVar: uClazz.getAssociationVariables()) {
stringBuffer.append(TEXT_28);
if (assocVar.getRelatedAssociation().isOnlyOne() && assocVar.isMany()) {
if (assocVar.getRelatedAssociation().isOnlyOne() && assocVar.isIsNavigable() && assocVar.isMany()) {
stringBuffer.append(TEXT_29);
stringBuffer.append(assocVar.getType());
stringBuffer.append(TEXT_30);
Expand All @@ -204,7 +204,7 @@ public String generate(Object argument)
stringBuffer.append(TEXT_39);
}
stringBuffer.append(TEXT_40);
if (assocVar.getRelatedAssociation().isOnlyOne() && assocVar.isOne()) {
if (assocVar.getRelatedAssociation().isOnlyOne() && assocVar.isIsNavigable() && assocVar.isOne()) {
stringBuffer.append(TEXT_41);
stringBuffer.append(clazz.getClassName());
stringBuffer.append(TEXT_42);
Expand All @@ -226,7 +226,7 @@ public String generate(Object argument)
stringBuffer.append(TEXT_50);
}
stringBuffer.append(TEXT_51);
if ((assocVar.getRelatedAssociation().isN() || assocVar.getRelatedAssociation().isMN()) && assocVar.isMany()) {
if ((assocVar.getRelatedAssociation().isN() || assocVar.getRelatedAssociation().isMN()) && assocVar.isIsNavigable() && assocVar.isMany()) {
stringBuffer.append(TEXT_52);
stringBuffer.append(assocVar.getType());
stringBuffer.append(TEXT_53);
Expand Down
4 changes: 2 additions & 2 deletions UmpleUIGenerator/src/cruise/data/impl/dao/generic/KeyClass.java
View file
Expand Up @@ -117,7 +117,7 @@ public String generate(Object argument)
stringBuffer.append(TEXT_19);
for (Attribute att: keyClasses) {
stringBuffer.append(TEXT_20);
if ("int".equals(att.getType())|| "double".equals(att.getType()) || "boolean".equals(att.getType()) ) {
if ("int".equals(att.getType())|| "double".equals(att.getType()) || "float".equals(att.getType()) || "boolean".equals(att.getType()) ) {
stringBuffer.append(TEXT_21);
stringBuffer.append("a"+ att.getUpperCaseName());
stringBuffer.append(TEXT_22);
Expand All @@ -141,7 +141,7 @@ public String generate(Object argument)
stringBuffer.append(TEXT_31);
for (Attribute att: keyClasses) {
stringBuffer.append(TEXT_32);
if ("int".equals(att.getType())|| "double".equals(att.getType()) || "boolean".equals(att.getType()) ) {
if ("int".equals(att.getType())|| "double".equals(att.getType()) || "float".equals(att.getType()) || "boolean".equals(att.getType()) ) {
stringBuffer.append(TEXT_33);
stringBuffer.append("a"+ att.getUpperCaseName());
stringBuffer.append(TEXT_34);
Expand Down
2,442 changes: 1,229 additions & 1,213 deletions UmpleUIJSFProvider/src/cruise/ui/jsf/templates/impl/BckBean.java
View file

Large diffs are not rendered by default.

50 changes: 31 additions & 19 deletions UmpleUIJSFProvider/src/cruise/ui/jsf/templates/impl/BckBeanSingleton.java
View file
Expand Up @@ -48,14 +48,14 @@ public static synchronized BckBeanSingleton create(String lineSeparator)
protected final String TEXT_27 = "(";
protected final String TEXT_28 = " arg) {" + NL + "\t\tthis.a";
protected final String TEXT_29 = " = arg;" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_30 = "s() {" + NL + "\t\tBeanLinker bLinker = new BeanLinker();" + NL + "\t\tbLinker.setRoleName(\"";
protected final String TEXT_30 = "() {" + NL + "\t\tBeanLinker bLinker = new BeanLinker();" + NL + "\t\tbLinker.setRoleName(\"";
protected final String TEXT_31 = "\");" + NL + "\t\tbLinker.setLinker(getSelected";
protected final String TEXT_32 = "());" + NL + "\t\tPageFlowUtils.pushBeanLinker(bLinker);" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_33 = "sDone() {" + NL + "\t\t";
protected final String TEXT_33 = "Done() {" + NL + "\t\t";
protected final String TEXT_34 = " newValue =(";
protected final String TEXT_35 = ")PageFlowUtils.peekBeanLinker().getLinker();" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\tsetSelected";
protected final String TEXT_36 = "(newValue);" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_37 = "sCancel() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "" + NL + "\tpublic boolean isFrom";
protected final String TEXT_37 = "Cancel() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "" + NL + "\tpublic boolean isFrom";
protected final String TEXT_38 = "() {" + NL + "" + NL + "\t\treturn linked";
protected final String TEXT_39 = "() != null;" + NL + "\t}" + NL + "" + NL + "\tpublic ";
protected final String TEXT_40 = " linked";
Expand Down Expand Up @@ -84,14 +84,14 @@ public static synchronized BckBeanSingleton create(String lineSeparator)
protected final String TEXT_63 = "List(List<";
protected final String TEXT_64 = "> arg) {" + NL + "\t\tthis.a";
protected final String TEXT_65 = "List = arg;" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_66 = "s() {" + NL + "\t\tBeanLinker bLinker = new BeanLinker();" + NL + "\t\tbLinker.setRoleName(\"";
protected final String TEXT_66 = "() {" + NL + "\t\tBeanLinker bLinker = new BeanLinker();" + NL + "\t\tbLinker.setRoleName(\"";
protected final String TEXT_67 = "\");" + NL + "\t\tbLinker.setLinkerCollection(getSelected";
protected final String TEXT_68 = "List());" + NL + "\t\tPageFlowUtils.pushBeanLinker(bLinker);" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_69 = "sDone() {" + NL + "\t\tList<";
protected final String TEXT_69 = "Done() {" + NL + "\t\tList<";
protected final String TEXT_70 = "> newList=(List<";
protected final String TEXT_71 = ">)PageFlowUtils.peekBeanLinker().getLinkerCollection();" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\tsetSelected";
protected final String TEXT_72 = "List(newList);" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_73 = "sCancel() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "" + NL + "" + NL + "\t@SuppressWarnings(\"unchecked\")" + NL + "\tpublic void setSelected";
protected final String TEXT_73 = "Cancel() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "" + NL + "" + NL + "\t@SuppressWarnings(\"unchecked\")" + NL + "\tpublic void setSelected";
protected final String TEXT_74 = "List(List<";
protected final String TEXT_75 = "> selected";
protected final String TEXT_76 = "List) {" + NL + "\t\tPageFlowUtils.getPageFlow().put(\"selected";
Expand All @@ -112,14 +112,14 @@ public static synchronized BckBeanSingleton create(String lineSeparator)
protected final String TEXT_91 = "List(List<";
protected final String TEXT_92 = "> arg) {" + NL + "\t\tthis.a";
protected final String TEXT_93 = "List = arg;" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_94 = "s() {" + NL + "\t\tBeanLinker bLinker = new BeanLinker();" + NL + "\t\tbLinker.setRoleName(\"";
protected final String TEXT_94 = "() {" + NL + "\t\tBeanLinker bLinker = new BeanLinker();" + NL + "\t\tbLinker.setRoleName(\"";
protected final String TEXT_95 = "\");" + NL + "\t\tbLinker.setLinkerCollection(getSelected";
protected final String TEXT_96 = "List());" + NL + "\t\tPageFlowUtils.pushBeanLinker(bLinker);" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_97 = "sDone() {" + NL + "\t\tList<";
protected final String TEXT_97 = "Done() {" + NL + "\t\tList<";
protected final String TEXT_98 = "> newList =(List<";
protected final String TEXT_99 = ">)PageFlowUtils.peekBeanLinker().getLinkerCollection();" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\tsetSelected";
protected final String TEXT_100 = "List(newList);" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_101 = "sCancel() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "" + NL + "\t@SuppressWarnings(\"unchecked\")" + NL + "\tpublic void setSelected";
protected final String TEXT_101 = "Cancel() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "" + NL + "\t@SuppressWarnings(\"unchecked\")" + NL + "\tpublic void setSelected";
protected final String TEXT_102 = "List(List<";
protected final String TEXT_103 = "> selected";
protected final String TEXT_104 = "List) {" + NL + "\t\tPageFlowUtils.getPageFlow().put(\"selected";
Expand Down Expand Up @@ -159,15 +159,15 @@ public static synchronized BckBeanSingleton create(String lineSeparator)
protected final String TEXT_138 = "List(List<";
protected final String TEXT_139 = "> arg) {" + NL + "\t\tthis.a";
protected final String TEXT_140 = "List = arg;" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_141 = "s() {" + NL + "\t\tBeanLinker bLinker = new BeanLinker();" + NL + "\t\tbLinker.setRoleName(\"";
protected final String TEXT_141 = "() {" + NL + "\t\tBeanLinker bLinker = new BeanLinker();" + NL + "\t\tbLinker.setRoleName(\"";
protected final String TEXT_142 = "\");" + NL + "\t\tPageFlowUtils.pushBeanLinker(bLinker);" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_143 = "sDone() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_144 = "sCancel() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "" + NL + "" + NL + "\tpublic List<";
protected final String TEXT_143 = "Done() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "\t" + NL + "\tpublic String to";
protected final String TEXT_144 = "Cancel() {" + NL + "\t\tPageFlowUtils.popBeanLinker();" + NL + "\t\treturn \"\";" + NL + "\t}" + NL + "" + NL + "" + NL + "\tpublic List<";
protected final String TEXT_145 = "> getSelected";
protected final String TEXT_146 = "List() {" + NL + "\t\tif(this.getEdited";
protected final String TEXT_147 = "()!=null)" + NL + "\t\t\treturn this.getEdited";
protected final String TEXT_148 = "().get";
protected final String TEXT_149 = "s();" + NL + "\t\treturn null;" + NL + "\t}" + NL + NL;
protected final String TEXT_149 = "();" + NL + "\t\treturn null;" + NL + "\t}" + NL + NL;
protected final String TEXT_150 = NL;
protected final String TEXT_151 = " ";
protected final String TEXT_152 = NL;
Expand Down Expand Up @@ -724,11 +724,15 @@ public String generate(Object argument)
stringBuffer.append(TEXT_195);
stringBuffer.append(voName);
stringBuffer.append(TEXT_196);
stringBuffer.append(assocVar.getUpperCaseName());
int l=assocVar.getUpperCaseName().length();
stringBuffer.append(assocVar.getUpperCaseName().substring(0, l-1));
//stringBuffer.append(assocVar.getUpperCaseName());
stringBuffer.append(TEXT_197);
stringBuffer.append(voName);
stringBuffer.append(TEXT_198);
stringBuffer.append(assocVar.getUpperCaseName());
l=assocVar.getUpperCaseName().length();
stringBuffer.append(assocVar.getUpperCaseName().substring(0, l-1));
//stringBuffer.append(assocVar.getUpperCaseName());
stringBuffer.append(TEXT_199);
stringBuffer.append(voName);
stringBuffer.append(TEXT_200);
Expand All @@ -752,7 +756,9 @@ public String generate(Object argument)
stringBuffer.append(TEXT_209);
stringBuffer.append(voName);
stringBuffer.append(TEXT_210);
stringBuffer.append(assocVar.getUpperCaseName());
l=assocVar.getUpperCaseName().length();
stringBuffer.append(assocVar.getUpperCaseName().substring(0, l-1));
//stringBuffer.append(assocVar.getUpperCaseName());
stringBuffer.append(TEXT_211);
}
stringBuffer.append(TEXT_212);
Expand All @@ -766,11 +772,15 @@ public String generate(Object argument)
stringBuffer.append(TEXT_216);
stringBuffer.append(voName);
stringBuffer.append(TEXT_217);
stringBuffer.append(assocVar.getUpperCaseName());
int l=assocVar.getUpperCaseName().length();
stringBuffer.append(assocVar.getUpperCaseName().substring(0, l-1));
//stringBuffer.append(assocVar.getUpperCaseName());
stringBuffer.append(TEXT_218);
stringBuffer.append(voName);
stringBuffer.append(TEXT_219);
stringBuffer.append(assocVar.getUpperCaseName());
l=assocVar.getUpperCaseName().length();
stringBuffer.append(assocVar.getUpperCaseName().substring(0, l-1));
//stringBuffer.append(assocVar.getUpperCaseName());
stringBuffer.append(TEXT_220);
stringBuffer.append(voName);
stringBuffer.append(TEXT_221);
Expand All @@ -794,7 +804,9 @@ public String generate(Object argument)
stringBuffer.append(TEXT_230);
stringBuffer.append(voName);
stringBuffer.append(TEXT_231);
stringBuffer.append(assocVar.getUpperCaseName());
l=assocVar.getUpperCaseName().length();
stringBuffer.append(assocVar.getUpperCaseName().substring(0, l-1));
//stringBuffer.append(assocVar.getUpperCaseName());
stringBuffer.append(TEXT_232);
}
stringBuffer.append(TEXT_233);
Expand Down
2 changes: 1 addition & 1 deletion ...rovider/src/cruise/ui/jsf/templates/impl/GUI/associations/AssocManyToOneFormFragment.java
View file
Expand Up @@ -36,7 +36,7 @@ public static synchronized AssocManyToOneFormFragment create(String lineSeparato
protected final String TEXT_17 = NL + "\t\t\t\t\t\t\t" + NL + "\t\t<rich:column>\t" + NL + "\t\t\t<f:facet name=\"header\">Type</f:facet>" + NL + "\t\t\t<h:outputText value=\"#{reg.class.name}\" >" + NL + "\t\t\t</h:outputText>" + NL + "" + NL + "\t\t</rich:column>\t\t\t" + NL + "\t\t<f:facet name=\"footer\">" + NL + "\t\t\t<rich:datascroller renderIfSinglePage=\"false\" />" + NL + "" + NL + "\t\t</f:facet>" + NL + "\t</rich:dataTable>" + NL + "\t</rich:simpleTogglePanel>" + NL + "\t\t<a4j:commandLink value=\"\" reRender=\"";
protected final String TEXT_18 = "PanelRichPanel#{uniqueId}\"" + NL + "\t\t\timmediate=\"true\" " + NL + "\t\t\taction=\"#{";
protected final String TEXT_19 = "Bean.to";
protected final String TEXT_20 = "s}\"" + NL + "\t\t\toncomplete=\"Richfaces.showModalPanel('";
protected final String TEXT_20 = "}\"" + NL + "\t\t\toncomplete=\"Richfaces.showModalPanel('";
protected final String TEXT_21 = "GridPanel#{uniqueId}');\">" + NL + "\t\t\t<h:outputText value=\"Manage\" />" + NL + "\t\t</a4j:commandLink>" + NL + "\t\t\t\t\t</h:panelGrid>\t\t\t\t" + NL + "\t\t\t";

public String generate(Object argument)
Expand Down
4 changes: 2 additions & 2 deletions ...ovider/src/cruise/ui/jsf/templates/impl/GUI/associations/AssocManyToOnePanelFragment.java
View file
Expand Up @@ -22,7 +22,7 @@ public static synchronized AssocManyToOnePanelFragment create(String lineSeparat
protected final String TEXT_3 = "Bundle.";
protected final String TEXT_4 = "}\"></h:outputText>" + NL + "\t\t</h:panelGroup>" + NL + "\t</f:facet>" + NL + "\t<f:facet name=\"controls\">" + NL + "\t\t<h:panelGroup>" + NL + "" + NL + "\t\t\t<f:subview>" + NL + "\t\t\t\t<h:form>" + NL + "\t\t\t\t\t<a4j:commandLink" + NL + "\t\t\t\t\t\taction=\"#{";
protected final String TEXT_5 = "Bean.to";
protected final String TEXT_6 = "sDone}\" value=\"\"" + NL + "\t\t\t\t\t\treRender=\"";
protected final String TEXT_6 = "Done}\" value=\"\"" + NL + "\t\t\t\t\t\treRender=\"";
protected final String TEXT_7 = "MainPanel#{uniqueId}\"" + NL + "\t\t\t\t\t\toncomplete=\"Richfaces.hideModalPanel('";
protected final String TEXT_8 = "GridPanel#{uniqueId}');\">" + NL + "\t\t\t\t\t\t<h:graphicImage value=\"/images/icons/close.png\"" + NL + "\t\t\t\t\t\t\tstyleClass=\"hidelink\" />" + NL + "\t\t\t\t\t</a4j:commandLink>" + NL + "\t\t\t\t</h:form>" + NL + "\t\t\t</f:subview>" + NL + "\t\t</h:panelGroup>" + NL + "\t</f:facet>" + NL + "" + NL + "\t<rich:panel id=\"";
protected final String TEXT_9 = "PanelRichPanel#{uniqueId}\">" + NL;
Expand All @@ -33,7 +33,7 @@ public static synchronized AssocManyToOnePanelFragment create(String lineSeparat
protected final String TEXT_14 = "MainPanel#{uniqueId}\"/>" + NL + "\t\t\t<ui:param name=\"uniqueId\" value=\"";
protected final String TEXT_15 = "\"/>" + NL + "\t\t</ui:include>" + NL + "\t\t<f:subview>" + NL + "\t\t\t<h:form>" + NL + "\t\t\t\t<h:panelGrid columns=\"2\">" + NL + "\t\t\t\t\t<a4j:commandButton" + NL + "\t\t\t\t\t\taction=\"#{";
protected final String TEXT_16 = "Bean.to";
protected final String TEXT_17 = "sDone}\" value=\"Close\"" + NL + "\t\t\t\t\t\treRender=\"";
protected final String TEXT_17 = "Done}\" value=\"Close\"" + NL + "\t\t\t\t\t\treRender=\"";
protected final String TEXT_18 = "MainPanel#{uniqueId}\"" + NL + "\t\t\t\t\t\toncomplete=\"Richfaces.hideModalPanel('";
protected final String TEXT_19 = "GridPanel#{uniqueId}');\" />" + NL + "\t\t\t\t</h:panelGrid>" + NL + "\t\t\t</h:form>" + NL + "\t\t</f:subview>" + NL + "\t</rich:panel>" + NL + "</rich:modalPanel>";
protected final String TEXT_20 = "\t";
Expand Down
2 changes: 1 addition & 1 deletion ...rc/cruise/ui/jsf/templates/impl/GUI/associations/AssocManyToOneSingletonFormFragment.java
View file
Expand Up @@ -35,7 +35,7 @@ public static synchronized AssocManyToOneSingletonFormFragment create(String lin
protected final String TEXT_16 = NL + "\t\t\t\t\t\t\t" + NL + "\t\t<rich:column>\t" + NL + "\t\t\t<f:facet name=\"header\">Type</f:facet>" + NL + "\t\t\t<h:outputText value=\"#{reg.class.name}\" >" + NL + "\t\t\t</h:outputText>" + NL + "" + NL + "\t\t</rich:column>\t\t\t" + NL + "\t\t<f:facet name=\"footer\">" + NL + "\t\t\t<rich:datascroller renderIfSinglePage=\"false\" />" + NL + "" + NL + "\t\t</f:facet>" + NL + "\t</rich:dataTable>" + NL + "\t</rich:simpleTogglePanel>" + NL + "\t\t<a4j:commandLink value=\"\" reRender=\"";
protected final String TEXT_17 = "PanelRichPanel#{uniqueId}\"" + NL + "\t\t\taction=\"#{";
protected final String TEXT_18 = "Bean.to";
protected final String TEXT_19 = "s}\"" + NL + "\t\t\timmediate=\"true\" " + NL + "\t\t\toncomplete=\"Richfaces.showModalPanel('";
protected final String TEXT_19 = "}\"" + NL + "\t\t\timmediate=\"true\" " + NL + "\t\t\toncomplete=\"Richfaces.showModalPanel('";
protected final String TEXT_20 = "GridPanel#{uniqueId}');\">" + NL + "\t\t\t<h:outputText value=\"Manage\" />" + NL + "\t\t</a4j:commandLink>" + NL + "\t</h:panelGrid>\t\t\t\t" + NL + "\t\t\t";

public String generate(Object argument)
Expand Down

0 comments on commit aace2ed

Please sign in to comment.