Menu
▾
▴
equanda-svn-commit — svn commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(6) |
Aug
(41) |
Sep
(44) |
Oct
(31) |
Nov
(54) |
Dec
(53) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(71) |
Feb
(66) |
Mar
(65) |
Apr
(73) |
May
(68) |
Jun
(69) |
Jul
(28) |
Aug
(49) |
Sep
(44) |
Oct
(77) |
Nov
(64) |
Dec
(78) |
| 2009 |
Jan
(50) |
Feb
(28) |
Mar
(41) |
Apr
(30) |
May
(5) |
Jun
(30) |
Jul
(6) |
Aug
(2) |
Sep
(18) |
Oct
(11) |
Nov
(6) |
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(8) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tri...@us...> - 2008-12-28 12:40:05
|
Revision: 934
http://equanda.svn.sourceforge.net/equanda/?rev=934&view=rev
Author: triathlon98
Date: 2008-12-28 12:40:00 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
EQ-302 slight improvements in templates
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2008-12-28 12:38:01 UTC (rev 933)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2008-12-28 12:40:00 UTC (rev 934)
@@ -195,20 +195,18 @@
public List<String> onProvideCompletionsFromSelectedValue(String partial) {
List<String> matches = new ArrayList<String>();
- try{
- List<${ejbPackage}.client.${table.Name}> list = ${ejbPackage}.client.${table.Name}.selectEquandaReferenceStart(partial);
+ try
+ {
+ List<${table.Name}> list = ${table.Name}.selectEquandaReferenceStart(partial);
- for( ${ejbPackage}.client.${table.Name} ref : list )
+ for( ${table.Name} ref : list )
{
if( ref.getReference() != null || ref.getReference().length() != 0 )
matches.add( ref.getReference() );
}
}
- catch(Exception e)
- {
- e.printStackTrace();
- }
-
+ catch ( EquandaException ee )
+ { log.error( ee, ee ); }
return matches;
}
#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-28 12:38:04
|
Revision: 933
http://equanda.svn.sourceforge.net/equanda/?rev=933&view=rev
Author: triathlon98
Date: 2008-12-28 12:38:01 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
fix docs
Modified Paths:
--------------
trunk/equanda-tapestry5/src/site/wiki/jspagedloop.wiki
Modified: trunk/equanda-tapestry5/src/site/wiki/jspagedloop.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/jspagedloop.wiki 2008-12-28 12:37:12 UTC (rev 932)
+++ trunk/equanda-tapestry5/src/site/wiki/jspagedloop.wiki 2008-12-28 12:38:01 UTC (rev 933)
@@ -1,4 +1,4 @@
-h1. Tabs
+h1. JSPagedLoop
JSPagedLoop component loops an iterable list of values and allows you to immediately jump to a particular page index within the overall data set without page submit.
The component also allows you to add hidden items which can be displayed by clickin the "Add" link (again, without form submit).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-28 12:37:16
|
Revision: 932
http://equanda.svn.sourceforge.net/equanda/?rev=932&view=rev
Author: triathlon98
Date: 2008-12-28 12:37:12 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
fixes in JSPagedLoop demo
Modified Paths:
--------------
t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java
t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
Modified: t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java
===================================================================
--- t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java 2008-12-28 11:45:34 UTC (rev 931)
+++ t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java 2008-12-28 12:37:12 UTC (rev 932)
@@ -94,25 +94,26 @@
return n;
}
+ void onActivate()
+ {
+ list = new ArrayList<String>();
+ list.add( "We" );
+ list.add( "need" );
+ list.add( "a" );
+ list.add( "long" );
+ list.add( "list" );
+ list.add( "of" );
+ list.add( "items" );
+ list.add( "to" );
+ list.add( "show" );
+ list.add( "the" );
+ list.add( "paging" );
+ list.add( "in" );
+ list.add( "action." );
+ }
+
public List<String> getList()
{
- if ( null == list )
- {
- list = new ArrayList<String>();
- list.add( "We" );
- list.add( "need" );
- list.add( "a" );
- list.add( "long" );
- list.add( "list" );
- list.add( "of" );
- list.add( "items" );
- list.add( "to" );
- list.add( "show" );
- list.add( "the" );
- list.add( "paging" );
- list.add( "in" );
- list.add( "action." );
- }
return list;
}
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2008-12-28 11:45:34 UTC (rev 931)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2008-12-28 12:37:12 UTC (rev 932)
@@ -104,27 +104,13 @@
fully handled client side.</p>
<br/>
- <t:form>
- <div t:type="equanda/JSPagedLoop" source="list" current="current">
- <p>${current}</p>
- </div>
+ <t:form autofocus="false">
+ <ul>
+ <div t:type="equanda/JSPagedLoop" source="list" value="current" addRowLinkTitle="Add" >
+ <li>${current}</li>
+ </div>
+ </ul>
</t:form>
</t:parameter>
</span>
-
- <!--
- <p>another tab</p>
- <span t:type="equanda/Tabs" t:id="tristabs">
- <t:parameter name="contentAll"><p>This content is repeated on all tabs.</p></t:parameter>
- <t:parameter name="titleIcon"><img src="${smiley}"/></t:parameter>
- <t:parameter name="title1">Page 1</t:parameter>
- <t:parameter name="content1">
- <p>This is the first tab page of the second tab component.</p>
- </t:parameter>
- <t:parameter name="title2">Page 2</t:parameter>
- <t:parameter name="content2">
- <p>And when there is one, there should also be a second, otherwise there would be little use having a tab page.</p>
- </t:parameter>
- </span>
- -->
</t:layout>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-28 12:22:09
|
Revision: 930
http://equanda.svn.sourceforge.net/equanda/?rev=930&view=rev
Author: triathlon98
Date: 2008-12-28 11:41:53 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
fix pom and some links
Modified Paths:
--------------
t5-equanda-example/pom.xml
t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
Modified: t5-equanda-example/pom.xml
===================================================================
--- t5-equanda-example/pom.xml 2008-12-24 16:55:12 UTC (rev 929)
+++ t5-equanda-example/pom.xml 2008-12-28 11:41:53 UTC (rev 930)
@@ -28,22 +28,12 @@
<dependency>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>${equanda-release-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>t5c-commons</artifactId>
- <version>0.5.15</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-hibernate</artifactId>
- <version>${tapestry-release-version}</version>
- </dependency>
<dependency>
- <groupId>org.equanda</groupId>
- <artifactId>equanda-t5gui</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>t5c-commons</artifactId>
+ <version>${t5compo-release-version}</version>
</dependency>
</dependencies>
@@ -126,18 +116,6 @@
<url>http://maven.progs.be/m2repo</url>
</repository>
<repository>
- <id>jboss</id>
- <url>http://repository.jboss.com/maven2</url>
- </repository>
- <repository>
- <id>OpenQA</id>
- <url>http://maven.openqa.org</url>
- </repository>
- <repository>
- <id>tapestry-snapshots</id>
- <url>http://tapestry.formos.com/maven-snapshot-repository/</url>
- </repository>
- <repository>
<id>t5components</id>
<name>T5Components Maven Repository</name>
<url>http://87.193.218.134:8080/t5components/maven-repository</url>
@@ -167,6 +145,8 @@
</pluginRepositories>
<properties>
- <tapestry-release-version>5.0.17</tapestry-release-version>
+ <equanda-release-version>0.9.2-SNAPSHOT</equanda-release-version>
+ <tapestry-release-version>5.0.18</tapestry-release-version>
+ <t5compo-release-version>0.5.18</t5compo-release-version>
</properties>
</project>
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2008-12-24 16:55:12 UTC (rev 929)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2008-12-28 11:41:53 UTC (rev 930)
@@ -38,10 +38,10 @@
<t:parameter name="content4">
<div>
<ul>
- <li><a href="nowhere">Data</a></li>
- <li><a href="nowhere">Reports</a></li>
- <li><a href="nowhere">Import</a></li>
- <li><a href="nowhere">Export</a></li>
+ <li><a href="#nowhere">Data</a></li>
+ <li><a href="#nowhere">Reports</a></li>
+ <li><a href="#nowhere">Import</a></li>
+ <li><a href="#nowhere">Export</a></li>
</ul>
</div>
</t:parameter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-28 11:47:29
|
Revision: 931
http://equanda.svn.sourceforge.net/equanda/?rev=931&view=rev
Author: triathlon98
Date: 2008-12-28 11:45:34 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
fix some links
Modified Paths:
--------------
t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml 2008-12-28 11:41:53 UTC (rev 930)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/components/Layout.tml 2008-12-28 11:45:34 UTC (rev 931)
@@ -30,10 +30,10 @@
<t:parameter name="content4">
<div>
<ul>
- <li><a href="nowhere">Data</a></li>
- <li><a href="nowhere">Reports</a></li>
- <li><a href="nowhere">Import</a></li>
- <li><a href="nowhere">Export</a></li>
+ <li><a href="#nowhere">Data</a></li>
+ <li><a href="#nowhere">Reports</a></li>
+ <li><a href="#nowhere">Import</a></li>
+ <li><a href="#nowhere">Export</a></li>
</ul>
</div>
</t:parameter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-12-24 16:55:15
|
Revision: 929
http://equanda.svn.sourceforge.net/equanda/?rev=929&view=rev
Author: vladimirt
Date: 2008-12-24 16:55:12 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
changed dependencies
Modified Paths:
--------------
t5-equanda-example/pom.xml
Property Changed:
----------------
t5-equanda-example/
Property changes on: t5-equanda-example
___________________________________________________________________
Added: svn:ignore
+ target
.project
.classpath
.settings
Modified: t5-equanda-example/pom.xml
===================================================================
--- t5-equanda-example/pom.xml 2008-12-24 12:09:22 UTC (rev 928)
+++ t5-equanda-example/pom.xml 2008-12-24 16:55:12 UTC (rev 929)
@@ -30,6 +30,22 @@
<artifactId>equanda-tapestry5</artifactId>
<version>0.9.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>t5c-commons</artifactId>
+ <version>0.5.15</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tapestry</groupId>
+ <artifactId>tapestry-hibernate</artifactId>
+ <version>${tapestry-release-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-t5gui</artifactId>
+ <version>0.9.2-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
<build>
<finalName>t5example</finalName>
@@ -105,21 +121,28 @@
</reporting>
<repositories>
-
<repository>
<id>progs</id>
- <url>http://maven.progs.org/m2repo</url>
+ <url>http://maven.progs.be/m2repo</url>
</repository>
-
- <!-- This can org commented out when the tapestry-release-version is a not a snapshot. -->
- <!--
<repository>
+ <id>jboss</id>
+ <url>http://repository.jboss.com/maven2</url>
+ </repository>
+ <repository>
+ <id>OpenQA</id>
+ <url>http://maven.openqa.org</url>
+ </repository>
+ <repository>
<id>tapestry-snapshots</id>
<url>http://tapestry.formos.com/maven-snapshot-repository/</url>
</repository>
- -->
-
<repository>
+ <id>t5components</id>
+ <name>T5Components Maven Repository</name>
+ <url>http://87.193.218.134:8080/t5components/maven-repository</url>
+ </repository>
+ <repository>
<id>codehaus.snapshots</id>
<url>http://snapshots.repository.codehaus.org</url>
</repository>
@@ -144,6 +167,6 @@
</pluginRepositories>
<properties>
- <tapestry-release-version>5.0.15</tapestry-release-version>
+ <tapestry-release-version>5.0.17</tapestry-release-version>
</properties>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-24 12:09:42
|
Revision: 926
http://equanda.svn.sourceforge.net/equanda/?rev=926&view=rev
Author: triathlon98
Date: 2008-12-24 11:53:36 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
EQ-126 translate group labels
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm 2008-12-23 20:17:18 UTC (rev 925)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm 2008-12-24 11:53:36 UTC (rev 926)
@@ -8,7 +8,7 @@
#render( "edit.renderer.$group.RendererName" "" "" "" )
#else
<fieldset class="$group.TypeClass">
- <legend>${dollar}{group.${table.Name}.${group.Name}}</legend>
+ <legend>${dollar}{equanda-message:group.${table.Name}.${group.Name}}</legend>
#foreach( $field in $group.Fields )
#render( "field" "" "" "" )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-24 12:09:37
|
Revision: 927
http://equanda.svn.sourceforge.net/equanda/?rev=927&view=rev
Author: triathlon98
Date: 2008-12-24 11:54:53 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
EQ-270 remove comments
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2008-12-24 11:53:36 UTC (rev 926)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2008-12-24 11:54:53 UTC (rev 927)
@@ -6,10 +6,6 @@
<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
-#*<!-- @todo should be pagedloop but this is too slow, EQ-270
- <div class="eqInlR" t:id="pagedLoop" t:type="loop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
--->*#
-
<div class="eqInlR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2008-12-24 11:53:36 UTC (rev 926)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2008-12-24 11:54:53 UTC (rev 927)
@@ -6,10 +6,6 @@
<div class="eqInlP" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
-#*<!-- @todo should be pagedloop but this is too slow, EQ-270
- <div class="eqInlPR" t:id="pagedLoop" t:type="loop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
- <t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
--->*#
<div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
@@ -31,9 +27,6 @@
</t:if>
#*<t:if t:test="textType">
<textarea t:type="TextArea" t:translate="prop:translator" rows="5" cols="50" t:mixins="t5components/Resizable" t:value="current" t:disabled="prop:disabled" onkeyup="eqCC(this, ${clientCaseConversion});"/>
- </t:if>
- <t:if t:test="booleanType">
- <input t:type="CheckBox" t:value="current" t:disabled="prop:disabled"/>
</t:if>*#
<t:if t:test="passwordType">
<input t:type="PasswordField" t:translate="prop:translator" t:value="current" t:disabled="prop:disabled"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2008-12-24 11:53:36 UTC (rev 926)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2008-12-24 11:54:53 UTC (rev 927)
@@ -1,8 +1,5 @@
<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
-#*<!-- @todo should be pagedloop but this is too slow, EQ-270
- <div class="eqLLR" t:type="loop" source="value" value="current" index="index" rowsPerPage="5" volatile="true">
--->*#
<div class="eqLLR" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="5" volatile="true">
<t:parameter name="empty"></t:parameter>
<div class="eqLLRE"><t:equanda.formactionlink t:id="Delete" context="index" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" /></t:equanda.formactionlink></div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-24 12:09:24
|
Revision: 928
http://equanda.svn.sourceforge.net/equanda/?rev=928&view=rev
Author: triathlon98
Date: 2008-12-24 12:09:22 +0000 (Wed, 24 Dec 2008)
Log Message:
-----------
EQ-302 assure the layout can look good with autocomplete
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/text.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm 2008-12-24 11:54:53 UTC (rev 927)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm 2008-12-24 12:09:22 UTC (rev 928)
@@ -1,5 +1,7 @@
#if( $field.isMultiple() )
<input t:type="InlinePrimitiveList" t:translator="prop:stringTranslator" t:value="value.${field.VarName}" embedded="${field.isEmbedded()}" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end #if( $field.isCaseConversionClass() ) caseConversionClass="$field.caseConversion.className" #end #if( $field.isCaseConversionUpper() ) caseConversionUpper="true" #elseif( $field.isCaseConversionLower() ) caseConversionLower="true" #end/>
#else
+<div class="in">
<input t:type="TextField" maxlength="$field.Length" size="$field.DisplayLength" #if( $field.isCaseConversionClass() ) t:value="${field.Name}Value" #else t:value="value.${field.Name}" #end #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end #if( $field.hasCaseConversion() )onkeyup="eqCC(this, #if( $field.isCaseConversionUpper()) 2 #elseif( $field.isCaseConversionLower() ) 1 #else 0 #end);"#end #if( $field.isRequired() )t:validate="required"#end />
+</div>
#end
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/text.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/text.tml.vm 2008-12-24 11:54:53 UTC (rev 927)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/text.tml.vm 2008-12-24 12:09:22 UTC (rev 928)
@@ -1,5 +1,7 @@
#if( $field.isMultiple() )
##<input t:type="InlinePrimitiveList" t:textType="true" t:translator="prop:stringTranslator" t:value="value.${field.Name}" embedded="${field.isEmbedded()}" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end #if( $field.isCaseConversionClass() ) caseConversionClass="$field.caseConversion.className" #end #if( $field.isCaseConversionUpper() ) caseConversionUpper="true" #elseif( $field.isCaseConversionLower() ) caseConversionLower="true" #end/>
#else
+<div class="in">
<textarea t:type="TextArea" rows="5" cols="50" t:mixins="t5components/Resizable" t:value="value.${field.Name}" #if( $field.isCalculated() || $field.isAuto() )disabled="true"#end #if( $field.hasCaseConversion() )onkeyup="eqCC(this, #if( $field.isCaseConversionUpper()) 2 #elseif( $field.isCaseConversionLower() ) 1 #else 0 #end);"#end/>
+</div>
#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-23 20:17:29
|
Revision: 925
http://equanda.svn.sourceforge.net/equanda/?rev=925&view=rev
Author: triathlon98
Date: 2008-12-23 20:17:18 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
EQ-126 translate group labels
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm 2008-12-23 15:22:11 UTC (rev 924)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm 2008-12-23 20:17:18 UTC (rev 925)
@@ -8,7 +8,7 @@
#render( "edit.renderer.$group.RendererName" "" "" "" )
#else
<fieldset class="$group.TypeClass">
- <legend>${dollar}}{group.${table.Name}.${group.Name}}</legend>
+ <legend>${dollar}{group.${table.Name}.${group.Name}}</legend>
#foreach( $field in $group.Fields )
#render( "field" "" "" "" )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-12-23 15:22:15
|
Revision: 924
http://equanda.svn.sourceforge.net/equanda/?rev=924&view=rev
Author: vladimirt
Date: 2008-12-23 15:22:11 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
EQ-270 - JSPagedLoop component is too slow
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml 2008-12-23 15:13:11 UTC (rev 923)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml 2008-12-23 15:22:11 UTC (rev 924)
@@ -1,6 +1,6 @@
<t:container xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:loop t:id="loop" source="pagedSource" index="index">
+ <t:loop t:id="loop" source="pagedSource">
<div id="${currentRowId}" class="eqplr_${fixedClientId} eqJSPL" style="${displayStyle}">
<t:body />
</div>
@@ -23,7 +23,7 @@
<t:delegate t:to="bottomBlock" />
</div>
- <div class="eqplal_${fixedClientId}">
+ <div class="eqplal_${fixedClientId}" style="display:none;">
<a href="javascript:;" onclick="eqJsplA( eqJsplC.${fixedClientId} )">${addRowLinkTitle}</a>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-12-23 15:13:15
|
Revision: 923
http://equanda.svn.sourceforge.net/equanda/?rev=923&view=rev
Author: vladimirt
Date: 2008-12-23 15:13:11 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
EQ-270 - JSPagedLoop component is too slow
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2008-12-23 14:52:28 UTC (rev 922)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2008-12-23 15:13:11 UTC (rev 923)
@@ -6,15 +6,15 @@
<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
-<!-- @todo should be pagedloop but this is too slow, EQ-270
+#*<!-- @todo should be pagedloop but this is too slow, EQ-270
+ <div class="eqInlR" t:id="pagedLoop" t:type="loop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
+-->*#
+
<div class="eqInlR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
<t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
</t:parameter>
--->
- <div class="eqInlR" t:id="pagedLoop" t:type="loop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
-
<div class="eqInlRL">
<a href="javascript:;" id="ed-${dollar}{clientId}-${dollar}{index}" onclick="eqMarkDel( this, '${dollar}{deletedHiddenId}', ${dollar}{index}, 'er-${dollar}{clientId}-${dollar}{index}', 'ea-${dollar}{clientId}-${dollar}{index}' )" title="${dollar}{equanda-message:Delete}"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" alt="${dollar}{equanda-message:Delete}" /></a>
<a href="javascript:;" id="ea-${dollar}{clientId}-${dollar}{index}" onclick="eqRevDel( this, '${dollar}{deletedHiddenId}', ${dollar}{index}, 'er-${dollar}{clientId}-${dollar}{index}', 'ed-${dollar}{clientId}-${dollar}{index}' )" style="display: none;" title="${dollar}{equanda-message:UndoDelete}"><img src="${dollar}{asset:classpath:org/equanda/t5gui/undo_delete.gif}" alt="${dollar}{equanda-message:UndoDelete}" /></a>
@@ -23,6 +23,5 @@
<t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" editIndex="index" selectComponentId="prop:clientId"/></t:if>
</div>
</div>
- <t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
</div>
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2008-12-23 14:52:28 UTC (rev 922)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2008-12-23 15:13:11 UTC (rev 923)
@@ -1,10 +1,10 @@
<div class="eqLL" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
-<!-- @todo should be pagedloop but this is too slow, EQ-270
+#*<!-- @todo should be pagedloop but this is too slow, EQ-270
+ <div class="eqLLR" t:type="loop" source="value" value="current" index="index" rowsPerPage="5" volatile="true">
+-->*#
<div class="eqLLR" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="5" volatile="true">
<t:parameter name="empty"></t:parameter>
--->
- <div class="eqLLR" t:type="loop" source="value" value="current" index="index" rowsPerPage="5" volatile="true">
<div class="eqLLRE"><t:equanda.formactionlink t:id="Delete" context="index" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" /></t:equanda.formactionlink></div>
<div class="eqLLRD"><t:${table.VarName}.SummaryEditLink object="current"/></div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-12-23 14:52:31
|
Revision: 922
http://equanda.svn.sourceforge.net/equanda/?rev=922&view=rev
Author: vladimirt
Date: 2008-12-23 14:52:28 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
EQ-270 - JSPagedLoop component is too slow
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2008-12-23 14:51:14 UTC (rev 921)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2008-12-23 14:52:28 UTC (rev 922)
@@ -6,10 +6,10 @@
<div class="eqInlP" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
-<!-- @todo should be pagedloop but this is too slow, EQ-270
+#*<!-- @todo should be pagedloop but this is too slow, EQ-270
<div class="eqInlPR" t:id="pagedLoop" t:type="loop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
--->
+-->*#
<div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-12-23 14:51:16
|
Revision: 921
http://equanda.svn.sourceforge.net/equanda/?rev=921&view=rev
Author: vladimirt
Date: 2008-12-23 14:51:14 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
EQ-270 - JSPagedLoop component is too slow
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java 2008-12-23 14:50:20 UTC (rev 920)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java 2008-12-23 14:51:14 UTC (rev 921)
@@ -201,7 +201,6 @@
if ( pageIndex != config.getLastIndex() + 1 )
{
- // element.appendChild( document.createTextNode( "..." ) );
writer.element( "div" );
writer.write( "..." );
writer.end();
@@ -211,49 +210,16 @@
if ( pageIndex == config.getCurrentPage() )
{
- // Object span = document.createElement( "span" );
- // span.className = "eqplc";
- // span.innerHTML = "" + pageIndex;
- // element.appendChild( span );
writer.element( "span", "class", "eqplc" );
writer.write( "" + pageIndex );
writer.end();
return;
}
- // Object anchor = document.createElement( "a" );
- // anchor.href = "javascript:;";
- // anchor.onclick = function()
- // {
- // eqShwPg( pageIndex, config );
- // };
- // anchor.title = "Goto Page " + pageIndex;
- // anchor.innerHTML = "" + pageIndex;
- // element.appendChild( anchor );
writer.element( "a", "href", "javascript:;", "onclick", String.format( "eqShwPg( %s, %s )", pageIndex,
"eqJsplC." + config.getName() ), "title", "Goto Page " + pageIndex );
writer.write( "" + pageIndex );
writer.end();
}
- private boolean eqChAL( PagerConfig config )
- {
- /*var addLinks = $$( "." + config.addLinkClass );
- var addBlocks = $$( "." + config.addBlockClass );
- if( addLinks.length == 0 || addBlocks.length == 0 )
- {
- return;
- }*/
- return config.getAdditionalRowCount() != 0 && config.getAddedRowCount() != config.getAdditionalRowCount();
- /*{
- // addLinks[0].hide();
- // addBlocks[0].show();
- }
- else
- {
- // addLinks[0].show();
- // addBlocks[0].hide();
- }*/
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-12-23 14:50:31
|
Revision: 920
http://equanda.svn.sourceforge.net/equanda/?rev=920&view=rev
Author: vladimirt
Date: 2008-12-23 14:50:20 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
EQ-270 - JSPagedLoop component is too slow
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml
Added Paths:
-----------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm 2008-12-23 12:01:07 UTC (rev 919)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm 2008-12-23 14:50:20 UTC (rev 920)
@@ -95,7 +95,7 @@
private boolean caseConversionLower;
@Parameter
- private Translator translator;
+ private Translator<?> translator;
@Inject
private Request request;
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2008-12-23 12:01:07 UTC (rev 919)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.tml.vm 2008-12-23 14:50:20 UTC (rev 920)
@@ -7,13 +7,14 @@
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
<!-- @todo should be pagedloop but this is too slow, EQ-270
+ <div class="eqInlPR" t:id="pagedLoop" t:type="loop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
+ <t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
+-->
<div class="eqInlPR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
<t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
</t:parameter>
--->
- <div class="eqInlPR" t:id="pagedLoop" t:type="loop" source="value" value="current" volatile="true" index="index" rowsPerPage="5" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<div class="eqInlPRL">
<a href="javascript:;" id="ed-${dollar}{clientId}-${dollar}{index}" onclick="eqMarkDel( this, '${dollar}{deletedHiddenId}', ${dollar}{index}, 'er-${dollar}{clientId}-${dollar}{index}', 'ea-${dollar}{clientId}-${dollar}{index}' )" title="Delete"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" alt="${dollar}{equanda-message:Delete}" /></a>
<a href="javascript:;" id="ea-${dollar}{clientId}-${dollar}{index}" onclick="eqRevDel( this, '${dollar}{deletedHiddenId}', ${dollar}{index}, 'er-${dollar}{clientId}-${dollar}{index}', 'ed-${dollar}{clientId}-${dollar}{index}' )" style="display: none;" title="Undo Delete"><img src="${dollar}{asset:classpath:org/equanda/t5gui/undo_delete.gif}" alt="${dollar}{equanda-message:UndoDelete}" /></a>
@@ -39,6 +40,5 @@
</t:if>
</div>
</div>
- <t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
</div>
\ No newline at end of file
Added: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java (rev 0)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/base/PagerConfig.java 2008-12-23 14:50:20 UTC (rev 920)
@@ -0,0 +1,247 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.tapestry5.base;
+
+import org.apache.tapestry5.json.JSONObject;
+
+/**
+ * Configuration bean for {@link org.equanda.tapestry5.components.JSPager}
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class PagerConfig
+{
+ private int range;
+ private int maxPages;
+ private int rowsPerPage;
+ private int lastIndex;
+ private int currentPage;
+ private int rowCount;
+ private int addedRowCount;
+ private int additionalRowCount;
+ private String currentPageFieldName;
+ private String addedRowFieldName;
+ private String containerClass;
+ private String rowClass;
+ private String addLinkClass;
+ private String addBlockClass;
+ private String name;
+
+ public PagerConfig()
+ {
+
+ }
+
+ public PagerConfig( int range, int maxPages, int rowsPerPage, int lastIndex, int currentPage, int rowCount,
+ int addedRowCount, int additionalRowCount, String currentPageFieldName, String addedRowFieldName,
+ String containerClass, String rowClass, String addLinkClass, String addBlockClass, String name )
+ {
+ super();
+ this.range = range;
+ this.maxPages = maxPages;
+ this.rowsPerPage = rowsPerPage;
+ this.lastIndex = lastIndex;
+ this.currentPage = currentPage;
+ this.rowCount = rowCount;
+ this.addedRowCount = addedRowCount;
+ this.additionalRowCount = additionalRowCount;
+ this.currentPageFieldName = currentPageFieldName;
+ this.addedRowFieldName = addedRowFieldName;
+ this.containerClass = containerClass;
+ this.rowClass = rowClass;
+ this.addLinkClass = addLinkClass;
+ this.addBlockClass = addBlockClass;
+ this.name = name;
+ }
+
+ public int getRange()
+ {
+ return range;
+ }
+
+ public void setRange( int range )
+ {
+ this.range = range;
+ }
+
+ public int getMaxPages()
+ {
+ return maxPages;
+ }
+
+ public void setMaxPages( int maxPages )
+ {
+ this.maxPages = maxPages;
+ }
+
+ public int getRowsPerPage()
+ {
+ return rowsPerPage;
+ }
+
+ public void setRowsPerPage( int rowsPerPage )
+ {
+ this.rowsPerPage = rowsPerPage;
+ }
+
+ public int getLastIndex()
+ {
+ return lastIndex;
+ }
+
+ public void setLastIndex( int lastIndex )
+ {
+ this.lastIndex = lastIndex;
+ }
+
+ public int getCurrentPage()
+ {
+ return currentPage;
+ }
+
+ public void setCurrentPage( int currentPage )
+ {
+ this.currentPage = currentPage;
+ }
+
+ public int getRowCount()
+ {
+ return rowCount;
+ }
+
+ public void setRowCount( int rowCount )
+ {
+ this.rowCount = rowCount;
+ }
+
+ public int getAddedRowCount()
+ {
+ return addedRowCount;
+ }
+
+ public void setAddedRowCount( int addedRowCount )
+ {
+ this.addedRowCount = addedRowCount;
+ }
+
+ public int getAdditionalRowCount()
+ {
+ return additionalRowCount;
+ }
+
+ public void setAdditionalRowCount( int additionalRowCount )
+ {
+ this.additionalRowCount = additionalRowCount;
+ }
+
+ public String getCurrentPageFieldName()
+ {
+ return currentPageFieldName;
+ }
+
+ public void setCurrentPageFieldName( String currentPageFieldName )
+ {
+ this.currentPageFieldName = currentPageFieldName;
+ }
+
+ public String getAddedRowFieldName()
+ {
+ return addedRowFieldName;
+ }
+
+ public void setAddedRowFieldName( String addedRowFieldName )
+ {
+ this.addedRowFieldName = addedRowFieldName;
+ }
+
+ public String getContainerClass()
+ {
+ return containerClass;
+ }
+
+ public void setContainerClass( String containerClass )
+ {
+ this.containerClass = containerClass;
+ }
+
+ public String getRowClass()
+ {
+ return rowClass;
+ }
+
+ public void setRowClass( String rowClass )
+ {
+ this.rowClass = rowClass;
+ }
+
+ public String getAddLinkClass()
+ {
+ return addLinkClass;
+ }
+
+ public void setAddLinkClass( String addLinkClass )
+ {
+ this.addLinkClass = addLinkClass;
+ }
+
+ public String getAddBlockClass()
+ {
+ return addBlockClass;
+ }
+
+ public void setAddBlockClass( String addBlockClass )
+ {
+ this.addBlockClass = addBlockClass;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+ public JSONObject getJSONObject()
+ {
+ JSONObject object = new JSONObject();
+ object.put( "range", range );
+ object.put( "rowsPerPage", rowsPerPage );
+ object.put( "lastIndex", lastIndex );
+ object.put( "currentPage", currentPage );
+ object.put( "rowCount", rowCount );
+ object.put( "addedRowCount", addedRowCount );
+ object.put( "additionalRowCount", additionalRowCount );
+ object.put( "currentPageFieldName", currentPageFieldName );
+ object.put( "addedRowFieldName", addedRowFieldName );
+ object.put( "containerClass", containerClass );
+ object.put( "rowClass", rowClass );
+ object.put( "addLinkClass", addLinkClass );
+ object.put( "addBlockClass", addBlockClass );
+ object.put( "name", name );
+ return object;
+ }
+}
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2008-12-23 12:01:07 UTC (rev 919)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPagedLoop.java 2008-12-23 14:50:20 UTC (rev 920)
@@ -35,6 +35,7 @@
import org.apache.tapestry5.services.FormSupport;
import org.apache.tapestry5.services.Request;
import org.equanda.tapestry5.base.ObjectCreatorDelegate;
+import org.equanda.tapestry5.base.PagerConfig;
import org.slf4j.Logger;
import java.util.ArrayList;
@@ -312,7 +313,49 @@
{
return addedRowHidden.getClientId();
}
+
+ private PagerConfig config;
+ public PagerConfig getConfig()
+ {
+ return config;
+ }
+
+ public void setConfig( PagerConfig config )
+ {
+ this.config = config;
+ }
+
+ public String getDisplayStyle()
+ {
+ if ( getConfig() == null )
+ {
+ setConfig( internalPager.getConfig() );
+ }
+ PagerConfig config = getConfig();
+ int availableRows = config.getRowCount() - config.getAdditionalRowCount() + config.getAddedRowCount();
+
+ config.setMaxPages( ( ( availableRows - 1 ) / config.getRowsPerPage() ) + 1 );
+
+ if ( config.getMaxPages() > 0 && config.getCurrentPage() > config.getMaxPages() )
+ {
+ config.setCurrentPage( config.getMaxPages() );
+ }
+
+ int startIndex = config.getRowsPerPage() * ( config.getCurrentPage() - 1 );
+ int endIndex = startIndex + config.getRowsPerPage() - 1;
+
+ if ( index >= startIndex && index <= endIndex
+ && index < config.getRowCount() - config.getAdditionalRowCount() + config.getAddedRowCount() )
+ {
+ return "";
+ }
+ else
+ {
+ return "display:none;";
+ }
+ }
+
@SetupRender
Object setupRender()
{
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java 2008-12-23 12:01:07 UTC (rev 919)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/JSPager.java 2008-12-23 14:50:20 UTC (rev 920)
@@ -28,14 +28,14 @@
import org.apache.tapestry5.RenderSupport;
import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.Environment;
+import org.equanda.tapestry5.base.PagerConfig;
import java.util.List;
/**
* Equanda modification of {@link org.apache.tapestry5.corelib.components.GridPager}
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
@IncludeStylesheet( value = { "classpath:/org/equanda/tapestry5/resources/jspager.css" } )
@@ -65,6 +65,22 @@
@Inject
private Environment environment;
+ public PagerConfig getConfig()
+ {
+ JSPagedLoop pagedLoop = environment.peek( JSPagedLoop.class );
+
+ int availableRows = source.size() - pagedLoop.getAddedRowCount();
+
+ String clientId = pagedLoop.getClientId().toLowerCase();
+
+ int maxPages = ( ( availableRows - 1 ) / rowsPerPage ) + 1;
+
+ return new PagerConfig( range, maxPages, rowsPerPage, 0, pagedLoop.getCurrentPage(), source.size(), pagedLoop
+ .getAddedRowCount(), pagedLoop.getAdditionalRowCount(), pagedLoop.getCurrentPageFieldName(), pagedLoop
+ .getAddedRowFieldName(), "eqpl_" + clientId, "eqplr_" + clientId, "eqplal_" + clientId, "eqplab_"
+ + clientId, clientId );
+ }
+
@BeginRender
void render( MarkupWriter writer )
{
@@ -80,12 +96,17 @@
{
return;
}*/
+
String clientId = pagedLoop.getClientId().toLowerCase();
writer.element( "div", "class", "eqplp eqpl_" + clientId );
+
+ PagerConfig config = getConfig();
+
+ showPage( pagedLoop.getCurrentPage(), config, writer );
writer.end();
- JSONObject object = new JSONObject();
+ /*JSONObject object = new JSONObject();
object.put( "range", range );
// object.put( "maxPages", maxPages );
object.put( "rowsPerPage", rowsPerPage );
@@ -101,10 +122,138 @@
object.put( "addLinkClass", "eqplal_" + clientId );
object.put( "addBlockClass", "eqplab_" + clientId );
object.put( "name", clientId );
- renderSupport.addScript( "eqJsplC.%s = %s;", clientId, object );
- renderSupport.addScript( "eqShwPg( %s, eqJsplC.%s );", pagedLoop.getCurrentPage(), clientId );
+ renderSupport.addScript( "eqJsplC.%s = %s;", clientId, object );*/
+ renderSupport.addScript( "eqJsplC.%s = %s;", clientId, config.getJSONObject() );
+ // renderSupport.addScript( "eqShwPg( %s, eqJsplC.%s );", pagedLoop.getCurrentPage(), clientId );
renderSupport.addScript( "eqChAL( eqJsplC.%s );", clientId );
// logger.info( String.format( "Config Object. %s = %s ", clientId, object ) );
}
}
+
+ private void showPage( int pageIdx, PagerConfig config, MarkupWriter writer )
+ {
+ if ( pageIdx > 0 )
+ {
+ config.setCurrentPage( pageIdx );
+ }
+
+ if ( config.getCurrentPage() == 0 )
+ {
+ config.setCurrentPage( 1 );
+ }
+
+ int availableRows = config.getRowCount() - config.getAdditionalRowCount() + config.getAddedRowCount();
+
+ config.setMaxPages( ( ( availableRows - 1 ) / config.getRowsPerPage() ) + 1 );
+
+ if ( config.getMaxPages() > 0 && config.getCurrentPage() > config.getMaxPages() )
+ {
+ config.setCurrentPage( config.getMaxPages() );
+ }
+
+ if ( config.getMaxPages() < 2 )
+ {
+ return;
+ }
+
+ config.setLastIndex( 0 );
+
+ for ( int i = 1; i <= 2; i++ )
+ {
+ equandaWritePageLink( i, config, writer );
+ }
+
+ int low = config.getCurrentPage() - config.getRange();
+ int high = config.getCurrentPage() + config.getRange();
+
+ if ( low < 1 )
+ {
+ low = 1;
+ high = 2 * config.getRange() + 1;
+ }
+ else
+ {
+ if ( high > config.getMaxPages() )
+ {
+ high = config.getMaxPages();
+ low = high - 2 * config.getRange();
+ }
+ }
+
+ for ( int i = low; i <= high; i++ )
+ {
+ equandaWritePageLink( i, config, writer );
+ }
+
+ for ( int i = config.getMaxPages() - 1; i <= config.getMaxPages(); i++ )
+ {
+ equandaWritePageLink( i, config, writer );
+ }
+ }
+
+ private void equandaWritePageLink( int pageIndex, PagerConfig config, MarkupWriter writer )
+ {
+ if ( pageIndex < 1 || pageIndex > config.getMaxPages() )
+ return;
+
+ if ( pageIndex <= config.getLastIndex() )
+ return;
+
+ if ( pageIndex != config.getLastIndex() + 1 )
+ {
+ // element.appendChild( document.createTextNode( "..." ) );
+ writer.element( "div" );
+ writer.write( "..." );
+ writer.end();
+ }
+
+ config.setLastIndex( pageIndex );
+
+ if ( pageIndex == config.getCurrentPage() )
+ {
+ // Object span = document.createElement( "span" );
+ // span.className = "eqplc";
+ // span.innerHTML = "" + pageIndex;
+ // element.appendChild( span );
+ writer.element( "span", "class", "eqplc" );
+ writer.write( "" + pageIndex );
+ writer.end();
+ return;
+ }
+
+ // Object anchor = document.createElement( "a" );
+ // anchor.href = "javascript:;";
+ // anchor.onclick = function()
+ // {
+ // eqShwPg( pageIndex, config );
+ // };
+ // anchor.title = "Goto Page " + pageIndex;
+ // anchor.innerHTML = "" + pageIndex;
+ // element.appendChild( anchor );
+ writer.element( "a", "href", "javascript:;", "onclick", String.format( "eqShwPg( %s, %s )", pageIndex,
+ "eqJsplC." + config.getName() ), "title", "Goto Page " + pageIndex );
+ writer.write( "" + pageIndex );
+ writer.end();
+ }
+
+ private boolean eqChAL( PagerConfig config )
+ {
+ /*var addLinks = $$( "." + config.addLinkClass );
+ var addBlocks = $$( "." + config.addBlockClass );
+ if( addLinks.length == 0 || addBlocks.length == 0 )
+ {
+ return;
+ }*/
+ return config.getAdditionalRowCount() != 0 && config.getAddedRowCount() != config.getAdditionalRowCount();
+ /*{
+ // addLinks[0].hide();
+ // addBlocks[0].show();
+ }
+ else
+ {
+ // addLinks[0].show();
+ // addBlocks[0].hide();
+ }*/
+ }
+
}
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml 2008-12-23 12:01:07 UTC (rev 919)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/JSPagedLoop.tml 2008-12-23 14:50:20 UTC (rev 920)
@@ -1,7 +1,7 @@
<t:container xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:loop t:id="loop" source="pagedSource">
- <div id="${currentRowId}" class="eqplr_${fixedClientId} eqJSPL" style="display:none;">
+ <t:loop t:id="loop" source="pagedSource" index="index">
+ <div id="${currentRowId}" class="eqplr_${fixedClientId} eqJSPL" style="${displayStyle}">
<t:body />
</div>
</t:loop>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-23 12:33:15
|
Revision: 919
http://equanda.svn.sourceforge.net/equanda/?rev=919&view=rev
Author: triathlon98
Date: 2008-12-23 12:01:07 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
EQ-126 translate group labels
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm 2008-12-22 15:42:49 UTC (rev 918)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/group.tml.vm 2008-12-23 12:01:07 UTC (rev 919)
@@ -8,7 +8,7 @@
#render( "edit.renderer.$group.RendererName" "" "" "" )
#else
<fieldset class="$group.TypeClass">
- <legend>$group.Name</legend>
+ <legend>${dollar}}{group.${table.Name}.${group.Name}}</legend>
#foreach( $field in $group.Fields )
#render( "field" "" "" "" )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-22 15:43:00
|
Revision: 918
http://equanda.svn.sourceforge.net/equanda/?rev=918&view=rev
Author: triathlon98
Date: 2008-12-22 15:42:49 +0000 (Mon, 22 Dec 2008)
Log Message:
-----------
EQ-302 fix for select on a multiple link field
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2008-12-19 11:07:27 UTC (rev 917)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2008-12-22 15:42:49 UTC (rev 918)
@@ -270,37 +270,5 @@
public String get${field.Name}Filter() { return EquandaGlobal.getQueryString( "${table.Name}.equandaCompareType${field.Name}" ); }
#end
-#if( $field.isLink() && $field.getLinkTable().getFieldReference() )
- private String ${field.getName()}SelectedValue;
- public String get${field.getName()}SelectedValue()
- {
- return ${field.getName()}SelectedValue;
- }
- public void set${field.getName()}SelectedValue( String ${field.getName()}SelectedValue )
- {
- this.${field.getName()}SelectedValue = ${field.getName()}SelectedValue;
- }
-
- public List<String> onProvideCompletionsFrom${field.getName()}SelectedValue(String partial) {
- List<String> matches = new ArrayList<String>();
-
- try{
- List<${ejbPackage}.client.${field.getLinkTable().getName()}> list = ${ejbPackage}.client.${field.getLinkTable().getName()}.selectEquandaReferenceStart(partial);
-
- for( ${ejbPackage}.client.${field.getLinkTable().getName()} ref : list )
- {
- if( ref.getReference() != null || ref.getReference().length() != 0 )
- matches.add( ref.getReference() );
- }
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
-
- return matches;
- }
-
#end
-#end
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2008-12-19 11:07:27 UTC (rev 917)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2008-12-22 15:42:49 UTC (rev 918)
@@ -1,3 +1,8 @@
+#** @vtlvariable name="dollar" type="java.lang.String" *#
+#** @vtlvariable name="generationdate" type="java.lang.String" *#
+#** @vtlvariable name="readOnlyContext" type="boolean" *#
+#** @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+#** @vtlvariable name="engine" type="org.equanda.generate.Generator" *#
#**
* This file is part of the equanda project.
*
@@ -25,8 +30,7 @@
*
* Contributor(s):
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- *#
-/**
+ *#/**
* This file is generated by equanda on $generationdate, do not modify
*/
@@ -34,6 +38,7 @@
#set( $ejbPackage=${engine.getConfig("ejb-package")} )
import ${ejbPackage}.client.${table.Name};
+import org.equanda.client.EquandaException;
import org.equanda.t5gui.*;
import org.equanda.t5gui.services.*;
import ${package}.pages.${table.Name}EquandaAll;
@@ -41,6 +46,7 @@
import org.apache.tapestry5.annotations.*;
import org.apache.tapestry5.corelib.base.AbstractField;
import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.log4j.Logger;
import java.util.*;
@@ -50,6 +56,8 @@
public class LinkOne
extends AbstractField
{
+ private static final Logger log = Logger.getLogger( LinkOne.class );
+
@Parameter( required = true )
private ${table.Name} value;
@@ -166,4 +174,42 @@
{
// nothing to do, I think
}
+
+#if( $table.FieldReference )
+ private String selectedValue;
+ public String getSelectedValue()
+ {
+ try
+ {
+ if ( null != selectedValue ) return value.get${table.FieldReference.Name}();
+ }
+ catch ( EquandaException ee )
+ { log.error( ee, ee ); }
+ return selectedValue;
+ }
+ public void setSelectedValue( String selectedValue )
+ {
+ this.selectedValue = selectedValue;
+ }
+
+ public List<String> onProvideCompletionsFromSelectedValue(String partial) {
+ List<String> matches = new ArrayList<String>();
+
+ try{
+ List<${ejbPackage}.client.${table.Name}> list = ${ejbPackage}.client.${table.Name}.selectEquandaReferenceStart(partial);
+
+ for( ${ejbPackage}.client.${table.Name} ref : list )
+ {
+ if( ref.getReference() != null || ref.getReference().length() != 0 )
+ matches.add( ref.getReference() );
+ }
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ return matches;
+ }
+#end
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2008-12-19 11:07:27 UTC (rev 917)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2008-12-22 15:42:49 UTC (rev 918)
@@ -9,6 +9,9 @@
<t:equanda.formactionlink t:id="Delete" context="prop:selectParameters" class="eqOp"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}"/></t:equanda.formactionlink>
</t:if>
<t:equanda.formactionlink t:id="Select" context="prop:selectParameters">${dollar}{equanda-message:Select}</t:equanda.formactionlink>
+#if( $table.FieldReference )
+ <div class="autocomplete"><input t:type="TextField" t:mixins="autocomplete" t:id="selectedValue"/></div>
+#end
<t:if test="hasValue()"><span style="padding-left: 10px;"><t:${table.VarName}.SummaryEditLink object="value"/></span></t:if>
</div>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2008-12-19 11:07:27 UTC (rev 917)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2008-12-22 15:42:49 UTC (rev 918)
@@ -42,11 +42,5 @@
</t:if>
</div>
-#if( $field.isLink() && $field.getLinkTable().getFieldReference() )
-<div class="autocomplete">
-<input t:type="TextField" t:mixins="autocomplete" t:id="${field.getName()}SelectedValue"/>
-</div>
-#end
-
</t:if>
#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-19 11:08:01
|
Revision: 917
http://equanda.svn.sourceforge.net/equanda/?rev=917&view=rev
Author: triathlon98
Date: 2008-12-19 11:07:27 +0000 (Fri, 19 Dec 2008)
Log Message:
-----------
fix for select on a multiple link field
Modified Paths:
--------------
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java 2008-12-18 18:19:10 UTC (rev 916)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java 2008-12-19 11:07:27 UTC (rev 917)
@@ -108,9 +108,10 @@
}
if ( null == base )
{
- if ( field.isMultiple() && !field.isLink() )
+ if ( field.isMultiple() )
{
base = field.getVarName();
+ if ( field.isLink() ) base = ""; // all is already there thanks to the QlPath
}
else if ( fieldForPath != null && fieldForPath.isMultiple() )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bri...@us...> - 2008-12-18 18:19:22
|
Revision: 916
http://equanda.svn.sourceforge.net/equanda/?rev=916&view=rev
Author: brian_reynolds
Date: 2008-12-18 18:19:10 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
Ensure tables that have more than one referenced link-tables generates correct java+tml.
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2008-12-18 16:35:09 UTC (rev 915)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2008-12-18 18:19:10 UTC (rev 916)
@@ -271,17 +271,17 @@
#end
#if( $field.isLink() && $field.getLinkTable().getFieldReference() )
- private String selectedValue;
- public String getSelectedValue()
- {
- return selectedValue;
+ private String ${field.getName()}SelectedValue;
+ public String get${field.getName()}SelectedValue()
+ {
+ return ${field.getName()}SelectedValue;
}
- public void setSelectedValue( String selectedValue )
+ public void set${field.getName()}SelectedValue( String ${field.getName()}SelectedValue )
{
- this.selectedValue = selectedValue;
+ this.${field.getName()}SelectedValue = ${field.getName()}SelectedValue;
}
-
- public List<String> onProvideCompletionsFromSelectedValue(String partial) {
+
+ public List<String> onProvideCompletionsFrom${field.getName()}SelectedValue(String partial) {
List<String> matches = new ArrayList<String>();
try{
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2008-12-18 16:35:09 UTC (rev 915)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2008-12-18 18:19:10 UTC (rev 916)
@@ -44,7 +44,7 @@
#if( $field.isLink() && $field.getLinkTable().getFieldReference() )
<div class="autocomplete">
-<input t:type="TextField" t:mixins="autocomplete" t:id="selectedValue"/>
+<input t:type="TextField" t:mixins="autocomplete" t:id="${field.getName()}SelectedValue"/>
</div>
#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-18 16:47:15
|
Revision: 915
http://equanda.svn.sourceforge.net/equanda/?rev=915&view=rev
Author: triathlon98
Date: 2008-12-18 16:35:09 +0000 (Thu, 18 Dec 2008)
Log Message:
-----------
fix for select on a multiple link field
Modified Paths:
--------------
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java 2008-12-17 09:39:57 UTC (rev 914)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Selection.java 2008-12-18 16:35:09 UTC (rev 915)
@@ -108,7 +108,7 @@
}
if ( null == base )
{
- if ( field.isMultiple() )
+ if ( field.isMultiple() && !field.isLink() )
{
base = field.getVarName();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-17 09:40:03
|
Revision: 914
http://equanda.svn.sourceforge.net/equanda/?rev=914&view=rev
Author: triathlon98
Date: 2008-12-17 09:39:57 +0000 (Wed, 17 Dec 2008)
Log Message:
-----------
EQ-300 changes in exception
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/client/EquandaUserInfo.java
trunk/equanda-client/src/main/java/org/equanda/client/LoginInfo.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxy.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaSelector.java
trunk/equanda-client/src/main/java/org/equanda/persistence/LazyEJBListBase.java
trunk/equanda-client/src/main/java/org/equanda/persistence/LazyList.java
trunk/equanda-client/src/main/java/org/equanda/persistence/LazyProxyListBase.java
trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
trunk/equanda-client/src/test/java/org/equanda/persistence/EquandaListTest.java
trunk/equanda-generate/src/main/velocity/docs/ProxyInterface.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/Mediator.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectEJBLocal.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorHelperBase.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ProxyObjectUpdater.java.vm
trunk/equanda-generate/src/main/velocity/login/LoginCache.java.vm
trunk/equanda-generate/src/main/velocity/login/LoginModule.java.vm
trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
trunk/equanda-generate/src/main/velocity/login/bean/LoginEJBLocal.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/EditPageBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/base/OneObjectComponentBase.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/InlinePrimitiveList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Action.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/ActionRes.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/Select.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/core/src/main/java/OrganizationMediator.java
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/core/src/main/java/UserMediator.java
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/components/Layout.java
trunk/equanda-server/src/main/java/org/equanda/cache/EquandaCache.java
trunk/equanda-server/src/main/java/org/equanda/validation/Default.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/ActionMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/AutoFieldsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/BuilderSetSelectorHelper.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/DefaultMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/EquandaRoleMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/LinkableMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/PriorityFieldsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/ProgrConstraintsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/SecurMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/SecurSelectorHelper.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/VeryDocumentedSelectorHelper.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ChoicesTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/CompareTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/DefaultTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EmbeddedTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EquandaQueryTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/MultipleFieldTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ProxyTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RemoveLinksTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RemoveTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RequiredFieldsTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SetEquandaRollbackTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/UniqueFieldsTest.java
Added Paths:
-----------
trunk/equanda-client/src/main/java/org/equanda/client/EquandaException.java
trunk/equanda-client/src/main/java/org/equanda/client/ExceptionCodes.java
Removed Paths:
-------------
trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java
Added: trunk/equanda-client/src/main/java/org/equanda/client/EquandaException.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/EquandaException.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/client/EquandaException.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -0,0 +1,202 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.client;
+
+import org.equanda.translations.TranslatorEJB;
+import org.equanda.translations.TranslatorEJBUtil;
+
+import javax.ejb.ApplicationException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Exception indicating a problem in the use of the equanda.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @author NetRom team
+ */
+@ApplicationException( rollback = true )
+public class EquandaException
+ extends Exception
+{
+ public static final String CORE_EXCEPTIONS_CONTEXT = "equanda-exceptions";
+ public static final String APPLICATION_EXCEPTIONS_CONTEXT = "app-exceptions";
+ public static final String DEFAULT_MESSAGE = "EXCEPTION";
+ private static final long serialVersionUID = 6523420918533106344L;
+ private int exceptionCode;
+ private String appendedParameters;
+ private String[] injectedParameters;
+ private static final List<String> CONTEXTS = new ArrayList<String>();
+
+ static
+ {
+ CONTEXTS.add( CORE_EXCEPTIONS_CONTEXT );
+ CONTEXTS.add( APPLICATION_EXCEPTIONS_CONTEXT );
+ }
+
+ public EquandaException()
+ {
+ }
+
+ public EquandaException( Exception ex )
+ {
+ super( ex );
+ }
+
+ public EquandaException( int exceptionCode, Exception ex, String... parameters )
+ {
+ super( ex );
+ this.exceptionCode = exceptionCode;
+ setParams( parameters );
+
+ }
+
+ public EquandaException( int exceptionCode, Exception ex )
+ {
+ super( ex );
+ this.exceptionCode = exceptionCode;
+ }
+
+ public EquandaException( int exceptionCode, String... parameters )
+ {
+ this.exceptionCode = exceptionCode;
+ setParams( parameters );
+ }
+
+ /**
+ * Checks to see if the parameters are supposed to replace some $, $$ in the message, or they will just be
+ * appended at the end
+ *
+ * @param parameters parameters
+ */
+ private void setParams( String... parameters )
+ {
+ String translatedCode = translateCode();
+ if ( translatedCode != null )
+ {
+ if ( translatedCode.contains( "$" ) )
+ {
+ injectedParameters = parameters;
+ }
+ else
+ {
+ if ( parameters != null && parameters.length > 0 )
+ {
+ this.appendedParameters = parameters[ 0 ];
+ }
+ }
+ }
+ }
+
+ public String[] getInjectedParameters()
+ {
+ return injectedParameters;
+ }
+
+ public EquandaException( int exceptionCode )
+ {
+ this.exceptionCode = exceptionCode;
+ }
+
+ private String translateMessage( String message )
+ {
+ try
+ {
+ TranslatorEJB translator = TranslatorEJBUtil.get();
+ return translator.translate( "en", message, CONTEXTS );
+ }
+ catch ( Exception ex ) { return message; }
+ }
+
+ private String translateCode()
+ {
+ return translateMessage( Integer.toString( exceptionCode ) );
+ }
+
+ String getDefaultMessage()
+ {
+ return DEFAULT_MESSAGE;
+ }
+
+ public String getMessage()
+ {
+ if ( getCause() != null )
+ {
+ return getShortMessage() + ", root cause " + getCause().getMessage();
+ }
+ else
+ {
+ return getShortMessage();
+ }
+ }
+
+ public String getShortMessage()
+ {
+ String message;
+ message = translateCode();
+ if ( message != null && injectedParameters != null && injectedParameters.length > 0 )
+ {
+ for ( int i = 0; i < injectedParameters.length ; i++ )
+ {
+ String needTranslationParam = "$$" + ( i + 1 );
+ if ( message.contains( needTranslationParam ) )
+ {
+ String translation = translateMessage( injectedParameters[ i ] );
+ if ( translation != null )
+ {
+ message = message.replace( needTranslationParam, translation );
+ }
+ else
+ {
+ message = message.replace( needTranslationParam, injectedParameters[ i ] );
+ }
+ }
+ String verbatimParam = "$" + ( i + 1 );
+ if ( message.contains( verbatimParam ) )
+ {
+ String rs = injectedParameters[ i ];
+ if ( rs == null ) rs = "[null]";
+ message = message.replace( verbatimParam, rs );
+ }
+ }
+ }
+ if ( message == null ) message = getDefaultMessage() + ' ' + exceptionCode;
+ if ( getAppendedParameters() != null )
+ {
+ message += " (" + getAppendedParameters() + ')';
+ }
+ return message;
+ }
+
+ public int getExceptionCode()
+ {
+ return exceptionCode;
+ }
+
+ public String getAppendedParameters()
+ {
+ return appendedParameters;
+ }
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/client/EquandaUserInfo.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/EquandaUserInfo.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/client/EquandaUserInfo.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -24,7 +24,6 @@
package org.equanda.client;
-import org.equanda.persistence.EquandaPersistenceException;
import java.sql.Timestamp;
/**
@@ -41,21 +40,21 @@
Timestamp getEquandaCreationDate();
String getUserName()
- throws EquandaPersistenceException;
+ throws EquandaException;
String getFirstName()
- throws EquandaPersistenceException;
+ throws EquandaException;
String getName()
- throws EquandaPersistenceException;
+ throws EquandaException;
String getPassword()
- throws EquandaPersistenceException;
+ throws EquandaException;
String getLanguage()
- throws EquandaPersistenceException;
+ throws EquandaException;
String getAuthAndConfig()
- throws EquandaPersistenceException;
+ throws EquandaException;
}
Copied: trunk/equanda-client/src/main/java/org/equanda/client/ExceptionCodes.java (from rev 911, trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/ExceptionCodes.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/client/ExceptionCodes.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -0,0 +1,68 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.client;
+
+/**
+ * Codes for EquandaPersistence exceptions, used for internationalization
+ *
+ * @author NetRom team
+ */
+public interface ExceptionCodes
+{
+ int EE_OBJECT_NOT_FOUND = 90000;
+ int EE_FAILED_TO_UPDATE_VALUE = 90001;
+ int EE_CANNOT_CREATE_LAZYCOLLECTION = 90002;
+ int EE_FAILED_PROXY_REMOVE = 90003;
+ int EE_CANNOT_INIT_BEAN = 90004;
+
+ int EPE_PERSISTENCE_EXCEPTION = 94000;
+ int EPE_NULL_UOID_INVALID = 94001;
+ int EPE_UOID_NOT_FOUND = 94002;
+
+ int ECV_COULD_NOT_TEST_CHOICES_USING_CLASS = 91001;
+ int ECV_VALUE_IS_NOT_ONE_OF_THE_CHOICES = 91002;
+ int ECV_COMPARE_CONSTRAINT_NOT_SATISFIED = 91003;
+ int ECV_IMMUTABLE_IF_OTHER_FIELD_IS_SET = 91004;
+ int ECV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD = 91005;
+ int ECV_FIELD_IS_REQUIRED = 91006;
+ int ECV_FIELD_IS_UNIQUE = 91007;
+ int ECV_INCLUDE_VALUE_HAS_WRONG_TYPE = 91008;
+ int ECV_FAILED_TO_CREATE_INCLUDED_VALUE = 91009;
+ int ECV_INTERNAL_ERROR_ON_CREATE_INCLUDED_VALUE = 91010;
+ int ECV_CONSTRAINT_VIOLATION = 91011;
+ int ECV_FAILED_TO_UPDATE_VALUE = 91012;
+ int ECV_DOWNCAST_FAILED_CANNOT_DOWNCAST_ROOT = 91013;
+ int ECV_DOWNCAST_SELECTOR_ERROR = 91014;
+ int ECV_DOWNCAST_CREATE_ERROR = 91015;
+ int ECV_INVALID_TABLE_TYPE = 91016;
+ int ECV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET = 91017;
+ int ECV_COMPARE_TYPE_CONSTRAINT_NOT_SATISFIED = 91018;
+ int ECV_CASCADE_KEEP = 90019;
+
+ int CME_DATA_HAS_BEEN_ALREADY_CHANGED = 92001;
+
+ int UONA_OPERATION_NOT_ALLOWED = 93001;
+
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/client/LoginInfo.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/LoginInfo.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/client/LoginInfo.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -25,7 +25,6 @@
package org.equanda.client;
import org.apache.log4j.Logger;
-import org.equanda.persistence.EquandaPersistenceException;
import java.util.List;
@@ -65,7 +64,7 @@
this.userName = user.getUserName();
this.password = user.getPassword();
}
- catch ( EquandaPersistenceException epe )
+ catch ( EquandaException epe )
{
log.error( epe, epe );
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -24,6 +24,8 @@
package org.equanda.persistence;
+import org.equanda.client.EquandaException;
+
/**
* Base interface for both local and remote EJB interfaces (for ObjectBase which is a shared interface for both).
*
@@ -33,18 +35,24 @@
extends HasId<ID>
{
void init( ID id )
- throws EquandaPersistenceException;
+ throws EquandaException;
+
void initEntity( EquandaEntity entity )
- throws EquandaPersistenceException;
+ throws EquandaException;
// equanda built-in methods
java.sql.Timestamp getEquandaModificationDate();
+
String getEquandaType();
+
boolean isEquandaType( String type );
+
String getEquandaName();
+
String getEquandaStatus();
+
void setEquandaStatus( String status );
-
- void remove();
+
+ void remove();
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -24,6 +24,8 @@
package org.equanda.persistence;
+import org.equanda.client.EquandaException;
+
/**
* Some extra mathods which are available in all importproxy objects
*
@@ -62,13 +64,13 @@
boolean isModified();
void equandaUpdate()
- throws EquandaPersistenceException;
+ throws EquandaException;
void equandaUpdate( boolean updateTypeFieldsOnly )
- throws EquandaPersistenceException;
+ throws EquandaException;
void removeEntityBean()
- throws EquandaPersistenceException;
+ throws EquandaException;
void setEquandaUpdate( boolean update );
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -24,6 +24,9 @@
package org.equanda.persistence;
+import org.equanda.client.EquandaException;
+import org.equanda.client.ExceptionCodes;
+
import javax.persistence.EntityManager;
/**
@@ -77,7 +80,7 @@
// fill in base (default) values when creating
public void create()
- throws EquandaPersistenceException
+ throws EquandaException
{}
// allow retrieval of the base entity information
@@ -88,7 +91,7 @@
public abstract ObjectType getEquandaTypeObject();
protected void checkImmutableIf( String field, String exclude )
- throws EquandaPersistenceException
+ throws EquandaException
{
// to be overwritten if needed
}
@@ -108,10 +111,10 @@
/**
* utility routine to allow checking the integrity of the record
*
- * @throws EquandaPersistenceException when constraints are violated
+ * @throws EquandaException when constraints are violated
*/
public void equandaCheckRules()
- throws EquandaPersistenceException
+ throws EquandaException
{
// to be overwritten if needed
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceException.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -24,12 +24,9 @@
package org.equanda.persistence;
-import org.equanda.translations.TranslatorEJB;
-import org.equanda.translations.TranslatorEJBUtil;
+import org.equanda.client.EquandaException;
import javax.ejb.ApplicationException;
-import java.util.ArrayList;
-import java.util.List;
/**
* Exception indicating a problem in the use of the equanda generated persistence layer.
@@ -39,23 +36,11 @@
*/
@ApplicationException( rollback = true )
public class EquandaPersistenceException
- extends Exception
+ extends EquandaException
{
- public static final String CORE_EXCEPTIONS_CONTEXT = "equanda-exceptions";
- public static final String APPLICATION_EXCEPTIONS_CONTEXT = "app-exceptions";
public static final String DEFAULT_MESSAGE = "PERSISTENCE EXCEPTION";
private static final long serialVersionUID = 6523420918533103446L;
- private int exceptionCode;
- private String appendedParameters;
- private String[] injectedParameters;
- private static final List<String> CONTEXTS = new ArrayList<String>();
- static
- {
- CONTEXTS.add( CORE_EXCEPTIONS_CONTEXT );
- CONTEXTS.add( APPLICATION_EXCEPTIONS_CONTEXT );
- }
-
public EquandaPersistenceException()
{
}
@@ -67,136 +52,26 @@
public EquandaPersistenceException( int exceptionCode, Exception ex, String... parameters )
{
- super( ex );
- this.exceptionCode = exceptionCode;
- setParams( parameters );
-
+ super( exceptionCode, ex, parameters );
}
public EquandaPersistenceException( int exceptionCode, Exception ex )
{
- super( ex );
- this.exceptionCode = exceptionCode;
+ super( exceptionCode, ex );
}
public EquandaPersistenceException( int exceptionCode, String... parameters )
{
- this.exceptionCode = exceptionCode;
- setParams( parameters );
+ super( exceptionCode, parameters );
}
- /**
- * Checks to see if the parameters are supposed to replace some $, $$ in the message, or they will just be
- * appended at the end
- *
- * @param parameters parameters
- */
- private void setParams( String... parameters )
- {
- String translatedCode = translateCode();
- if ( translatedCode != null )
- {
- if ( translatedCode.contains( "$" ) )
- {
- injectedParameters = parameters;
- }
- else
- {
- if ( parameters != null && parameters.length > 0 )
- {
- this.appendedParameters = parameters[ 0 ];
- }
- }
- }
- }
-
- public String[] getInjectedParameters()
- {
- return injectedParameters;
- }
-
public EquandaPersistenceException( int exceptionCode )
{
- this.exceptionCode = exceptionCode;
+ super( exceptionCode );
}
- private String translateMessage( String message )
- {
- try
- {
- TranslatorEJB translator = TranslatorEJBUtil.get();
- return translator.translate( "en", message, CONTEXTS );
- }
- catch ( Exception ex ) { return message; }
- }
-
- private String translateCode()
- {
- return translateMessage( Integer.toString( exceptionCode ) );
- }
-
String getDefaultMessage()
{
return DEFAULT_MESSAGE;
}
-
- public String getMessage()
- {
- if ( getCause() != null )
- {
- return getShortMessage() + ", root cause " + getCause().getMessage();
- }
- else
- {
- return getShortMessage();
- }
- }
-
- public String getShortMessage()
- {
- String message;
- message = translateCode();
- if ( message != null && injectedParameters != null && injectedParameters.length > 0 )
- {
- for ( int i = 0; i < injectedParameters.length ; i++ )
- {
- String needTranslationParam = "$$" + ( i + 1 );
- if ( message.contains( needTranslationParam ) )
- {
- String translation = translateMessage( injectedParameters[ i ] );
- if ( translation != null )
- {
- message = message.replace( needTranslationParam, translation );
- }
- else
- {
- message = message.replace( needTranslationParam, injectedParameters[ i ] );
- }
- }
- String verbatimParam = "$" + ( i + 1 );
- if ( message.contains( verbatimParam ) )
- {
- String rs = injectedParameters[ i ];
- if ( rs == null ) rs = "[null]";
- message = message.replace( verbatimParam, rs );
- }
- }
- }
- if ( message == null ) message = getDefaultMessage() + ' ' + exceptionCode;
- if ( getAppendedParameters() != null )
- {
- message += " (" + getAppendedParameters() + ')';
- }
- return message;
- }
-
- public int getExceptionCode()
- {
- return exceptionCode;
- }
-
- public String getAppendedParameters()
- {
- return appendedParameters;
- }
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxy.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxy.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaProxy.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -25,10 +25,12 @@
package org.equanda.persistence;
import javolution.lang.TextBuilder;
+import org.equanda.client.EquandaException;
+import org.equanda.client.ExceptionCodes;
import java.io.Serializable;
+import java.lang.reflect.Method;
import java.sql.Timestamp;
-import java.lang.reflect.Method;
/**
* Base class for proxies.
@@ -144,30 +146,30 @@
/**
* Update the proxy state, client changes are persisted, and server changes retrieved.
- * @throws EquandaPersistenceException update problems
+ * @throws EquandaException update problems
*/
public void equandaUpdate()
- throws EquandaPersistenceException
+ throws EquandaException
{
equandaUpdate( false );
}
public abstract void equandaUpdate( boolean updateTypeFieldsOnly )
- throws EquandaPersistenceException;
+ throws EquandaException;
/**
* Reset the proxy state. If the proxy was not modified, nothing happens, otherwise the state is retrieved from the
* server again.
*
- * @throws EquandaPersistenceException oops
+ * @throws EquandaException oops
*/
public abstract void equandaReset()
- throws EquandaPersistenceException;
+ throws EquandaException;
public void removeEntityBean()
- throws EquandaPersistenceException
+ throws EquandaException
{
- throw new EquandaPersistenceException( ExceptionCodes.UONA_OPERATION_NOT_ALLOWED );
+ throw new EquandaException( ExceptionCodes.UONA_OPERATION_NOT_ALLOWED );
}
public void setEquandaUpdate( boolean update )
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaSelector.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaSelector.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaSelector.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -24,6 +24,7 @@
package org.equanda.persistence;
+import org.equanda.client.EquandaException;
import org.equanda.persistence.query.EquandaQuery;
import java.util.List;
@@ -39,53 +40,53 @@
String getEquandaName();
PROXY equandaCreate( String type )
- throws EquandaPersistenceException;
+ throws EquandaException;
PROXY selectId( ID id )
- throws EquandaPersistenceException;
+ throws EquandaException;
EJB selectIdEJB( ID id )
- throws EquandaPersistenceException;
+ throws EquandaException;
PROXY[] selectMultipleId( ID[] arr )
- throws EquandaPersistenceException;
+ throws EquandaException;
/*
* run query methods
*/
List<PROXY> selectEquanda( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
List<EJB> selectEquandaEJB( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
List<ID> equandaRunQueryId( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
List<PROXY> equandaRunQuery( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
List<EJB> equandaRunQueryEJB( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
long equandaRunCountQuery( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
long equandaRunUpdateQuery( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
PROXY selectEquandaSingle( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
EJB selectEquandaSingleEJB( EquandaQuery query )
- throws EquandaPersistenceException;
+ throws EquandaException;
PROXY equandaRefresh( ID id, long version )
- throws EquandaPersistenceException;
+ throws EquandaException;
PROXY equandaUpdate( PROXY proxy )
- throws EquandaPersistenceException;
+ throws EquandaException;
void remove();
}
Deleted: trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/ExceptionCodes.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -1,71 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-package org.equanda.persistence;
-
-/**
- * Codes for EquandaPersistence exceptions, used for internationalization
- *
- * @author NetRom team
- */
-public interface ExceptionCodes
-{
- // @todo - some of these I can't find in ejb templates so they are either in use elsewhere, or they can be removed
- int UPE_PERSISTENCE_EXCEPTION = 90000;
- int UPE_CANNOT_CREATE_SESSION_FACADE = 90001;
- int UPE_OBJECT_NOT_FOUND = 90002;
- int UPE_FAILED_TO_UPDATE_VALUE = 90003;
- int UPE_TRYING_TO_UPDATE_OBJECT_WITH_UOID_NULL = 90004;
- int UPE_CANNOT_CREATE_LAZYCOLLECTION = 90005;
- int UPE_CASCADE_KEEP = 90006;
- int UPE_NULL_UOID_INVALID = 90007;
- int UPE_UOID_NOT_FOUND = 90008;
- int UPE_AUTO_FIELD_PROBLEM = 90009;
- int UPE_FAILED_PROXY_REMOVE = 90010;
- int UPE_CANNOT_INIT_BEAN = 90011;
-
- int ECV_COULD_NOT_TEST_CHOICES_USING_CLASS = 91001;
- int ECV_VALUE_IS_NOT_ONE_OF_THE_CHOICES = 91002;
- int ECV_COMPARE_CONSTRAINT_NOT_SATISFIED = 91003;
- int ECV_IMMUTABLE_IF_OTHER_FIELD_IS_SET = 91004;
- int ECV_CANNOT_ADD_NULL_TO_MULTIPLE_FIELD = 91005;
- int ECV_FIELD_IS_REQUIRED = 91006;
- int ECV_FIELD_IS_UNIQUE = 91007;
- int ECV_INCLUDE_VALUE_HAS_WRONG_TYPE = 91008;
- int ECV_FAILED_TO_CREATE_INCLUDED_VALUE = 91009;
- int ECV_INTERNAL_ERROR_ON_CREATE_INCLUDED_VALUE = 91010;
- int ECV_CONSTRAINT_VIOLATION = 91011;
- int ECV_FAILED_TO_UPDATE_VALUE = 91012;
- int ECV_DOWNCAST_FAILED_CANNOT_DOWNCAST_ROOT = 91013;
- int ECV_DOWNCAST_SELECTOR_ERROR = 91014;
- int ECV_DOWNCAST_CREATE_ERROR = 91015;
- int ECV_INVALID_TABLE_TYPE = 91016;
- int ECV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET = 91017;
- int ECV_COMPARE_TYPE_CONSTRAINT_NOT_SATISFIED = 91018;
-
- int CME_DATA_HAS_BEEN_ALREADY_CHANGED = 92001;
-
- int UONA_OPERATION_NOT_ALLOWED = 93001;
-
-}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/LazyEJBListBase.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/LazyEJBListBase.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/LazyEJBListBase.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -24,6 +24,7 @@
package org.equanda.persistence;
+import org.equanda.client.EquandaException;
import org.equanda.persistence.query.EquandaQuery;
import javax.naming.NamingException;
@@ -57,7 +58,7 @@
throws NamingException;
protected EJB getOneObject( ID id )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
SEL sel = getSelector();
EJB res = sel.selectIdEJB( id );
@@ -66,7 +67,7 @@
}
protected EJB getOneObject( int index )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
SelectorsStateType keepSelectorsState = SelectorsState.getSelectorsState();
try
@@ -91,13 +92,13 @@
}
protected EJB refreshObject( EJB obj )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
return obj;
}
protected EJB[] getMultipleObjects( ID[] ids )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
SEL sel = getSelector();
EJB[] res = (EJB[]) new EquandaEJB[ids.length];
@@ -107,7 +108,7 @@
}
protected EJB[] getMultipleObjects( int first, int size )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
SelectorsStateType keepSelectorsState = SelectorsState.getSelectorsState();
try
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/LazyList.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/LazyList.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/LazyList.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -25,6 +25,8 @@
package org.equanda.persistence;
import org.apache.log4j.Logger;
+import org.equanda.client.EquandaException;
+import org.equanda.client.ExceptionCodes;
import org.equanda.persistence.query.EquandaQuery;
import org.equanda.util.MockObject;
@@ -89,10 +91,10 @@
* @param id pk
* @return object with given id
* @throws NamingException problems
- * @throws EquandaPersistenceException problems
+ * @throws EquandaException problems
*/
protected abstract TYPE getOneObject( ID id )
- throws NamingException, EquandaPersistenceException;
+ throws NamingException, EquandaException;
/**
* Get TYPE objects for the given ids
@@ -100,10 +102,10 @@
* @param ids pks
* @return objects with given ids
* @throws NamingException problems
- * @throws EquandaPersistenceException problems
+ * @throws EquandaException problems
*/
protected abstract TYPE[] getMultipleObjects( ID[] ids )
- throws NamingException, EquandaPersistenceException;
+ throws NamingException, EquandaException;
/**
* Refresh the given object to make sure the data is live (used when cache timeout expired)
@@ -111,21 +113,19 @@
* @param obj object to refresh
* @return fresh version of object
* @throws NamingException problems
- * @throws EquandaPersistenceException problems
+ * @throws EquandaException problems
*/
protected abstract TYPE refreshObject( TYPE obj )
- throws NamingException, EquandaPersistenceException;
+ throws NamingException, EquandaException;
// used when multiple subselects are used with ADD operator
protected abstract TYPE getOneObject( int index )
- throws NamingException, EquandaPersistenceException;
+ throws NamingException, EquandaException;
protected abstract TYPE[] getMultipleObjects( int first, int size )
- throws NamingException, EquandaPersistenceException;
+ throws NamingException, EquandaException;
- /**
- * make sure this thing works
- */
+ /** make sure this thing works */
private static final Logger log = Logger.getLogger( LazyList.class );
private MockObject mock;
@@ -214,7 +214,7 @@
}
private TYPE getFromCache( int index )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
if ( getCacheCapacity() <= 1 || data != null )
{
@@ -276,7 +276,7 @@
if ( cache.length > 0 )
{
if ( nextObj != null && ( index == previousEndOfCache )
- && !nextObj.equals( cache[ 0 ].getId() ) )
+ && !nextObj.equals( cache[ 0 ].getId() ) )
{
throw new ConcurrentModificationException();
}
@@ -418,7 +418,7 @@
val = sel.equandaRunQueryEJB( query );
if ( val == null )
{
- throw new EquandaPersistenceException( UPE_CANNOT_CREATE_LAZYCOLLECTION );
+ throw new EquandaException( EE_CANNOT_CREATE_LAZYCOLLECTION );
}
for ( TYPE o : val )
{
@@ -440,18 +440,14 @@
}
}
- /**
- * @deprecated
- */
+ /** @deprecated */
public int size()
{
long size = fullSize();
return ( size > Integer.MAX_VALUE ) ? Integer.MAX_VALUE : (int) size;
}
- /**
- * make List object complete
- */
+ /** make List object complete */
public boolean isEmpty()
{
@@ -560,9 +556,7 @@
throw new UnsupportedOperationException( "subList(int,int) unsupported" );
}
- /**
- * refresh list, force release cache
- */
+ /** refresh list, force release cache */
public void refresh()
{
timeCache = 0;
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/LazyProxyListBase.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/LazyProxyListBase.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/LazyProxyListBase.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -24,6 +24,7 @@
package org.equanda.persistence;
+import org.equanda.client.EquandaException;
import org.equanda.persistence.query.EquandaQuery;
import javax.naming.NamingException;
@@ -57,7 +58,7 @@
throws NamingException;
protected PROXY getOneObject( ID id )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
SEL sel = getSelector();
PROXY res = sel.selectId( id );
@@ -66,7 +67,7 @@
}
protected PROXY getOneObject( int index )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
SelectorsStateType keepSelectorsState = SelectorsState.getSelectorsState();
try
@@ -91,14 +92,14 @@
}
protected PROXY refreshObject( PROXY obj )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
obj.equandaUpdate();
return obj;
}
protected PROXY[] getMultipleObjects( ID[] ids )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
SEL sel = getSelector();
PROXY[] res = sel.selectMultipleId( ids );
@@ -107,7 +108,7 @@
}
protected PROXY[] getMultipleObjects( int first, int size )
- throws NamingException, EquandaPersistenceException
+ throws NamingException, EquandaException
{
SelectorsStateType keepSelectorsState = SelectorsState.getSelectorsState();
try
Modified: trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
===================================================================
--- trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt 2008-12-17 09:39:57 UTC (rev 914)
@@ -1,61 +1,26 @@
;Last edited: 2007-06-03
.languages en;nl;ro;fr
.key 90000/equanda-exceptions
-.label.en Persistence exception
-.label.nl Persistence probleem
-.label.ro Exceptie de persistenta
-.label.fr Problème de persistance
-.key 90001/equanda-exceptions
-.label.en Can't create session facade
-.label.nl Kan sessie façade niet aanmaken
-.label.ro Nu se poate crea obiectul
-.label.fr Peut pas creér façade de session
-.key 90002/equanda-exceptions
.label.en Object not found
.label.nl Object niet gevonden
.label.ro Obiectul nu a fost gasit
.label.fr Objet non trouvé
-.key 90003/equanda-exceptions
+.key 90001/equanda-exceptions
.label.en Failed to update value
.label.nl Update van waarde is mislukt
.label.ro Valuarea nu a fost modificata
.label.fr Rafraishir valeur non reusit
-.key 90004/equanda-exceptions
-.label.en Trying to update object with UOID==null
-.label.nl Poging tot update object met uoid null
-.label.ro Incercare de a modifica un obiect care are UOID-ul null
-.label.fr Essai de rafraishir un objet avec uoid null
-.key 90005/equanda-exceptions
+.key 90002/equanda-exceptions
.label.en Can't create lazycollection
.label.nl Kan collectie niet aanmaken
.label.ro Nu se poate crea colectia intermediara
.label.fr Creation collection non reusit
-.key 90006/equanda-exceptions
-.label.en Cannot delete as there are references to this record
-.label.nl Kan gegevens niet verwijderen aangezien er nog verwijzingen naar bestaan
-.label.ro Verificare esuata pt Cascade-keep
-.label.fr Données ne peuvent pas être effacé si il-y a encore des références active
-.key 90007/equanda-exceptions
-.label.en Null UOID is not allowed
-.label.nl UOID is null
-.label.ro UOID-ul nu are voie sa fie gol sau null
-.label.fr UOID est null
-.key 90008/equanda-exceptions
-.label.en UOID $1 not found for an object of type $2
-.label.nl UOID $1 niet gevonden voor $2 object
-.label.ro UOID-ul $1 nu a fost gasit pentru un obiect de tipul $2
-.label.fr UOID $1 non trouvé pour un objet $2
-.key 90009/equanda-exceptions
-.label.en Cannot set auto field $$1
-.label.nl Kan auto veld $$2 niet zetten
-.label.ro Nu se poate seta un camp auto $$1
-.label.fr Problème avec champs automatique $$2
-.key 90010/equanda-exceptions
+.key 90003/equanda-exceptions
.label.en Cannot remove proxy when not saved
.label.nl Kan proxy niet verwijderen als niet opgeslagen
.label.ro Nu se poate sterge un proxy care nu a fost salvat
.label.fr Proxy non-sauvegardé ne peut pas être effacé
-.key 90011/equanda-exceptions
+.key 90004/equanda-exceptions
.label.en Cannot initialize bean
.label.nl Kan bean niet initializeren
.label.ro Bean-ul nu se poate initializa
@@ -140,6 +105,14 @@
.label.nl Ongeldig tabel type$$1 voor tabel $$2
.label.ro Tipul de tabla este invalid $$1 pentru tabela $$2
.label.fr Type de table $$1 non-valable pour table $$2
+.key 910018/equanda-exceptions
+.label.en Compare type constraint not satisfied
+.label.nl compare constraint niet voldaan
+.key 910019/equanda-exceptions
+.label.en Cannot delete as there are references to this record
+.label.nl Kan gegevens niet verwijderen aangezien er nog verwijzingen naar bestaan
+.label.ro Verificare esuata pt Cascade-keep
+.label.fr Données ne peuvent pas être effacé si il-y a encore des références active
.key 92001/equanda-exceptions
.label.en Data has already changed
.label.nl Data is reeds gewijzigd
@@ -150,6 +123,21 @@
.label.nl Operatie niet toegestaan
.label.ro Operatia nu este permisa
.label.fr Opération n'est pas permie
+.key 94000/equanda-exceptions
+.label.en Persistence exception
+.label.nl Persistence probleem
+.label.ro Exceptie de persistenta
+.label.fr Problème de persistance
+.key 94001/equanda-exceptions
+.label.en Null UOID is not allowed
+.label.nl UOID is null
+.label.ro UOID-ul nu are voie sa fie gol sau null
+.label.fr UOID est null
+.key 90002/equanda-exceptions
+.label.en UOID $1 not found for an object of type $2
+.label.nl UOID $1 niet gevonden voor $2 object
+.label.ro UOID-ul $1 nu a fost gasit pentru un obiect de tipul $2
+.label.fr UOID $1 non trouvé pour un objet $2
.key Action/equanda-fixed
.label.en Action
.label.nl Actie
Modified: trunk/equanda-client/src/test/java/org/equanda/persistence/EquandaListTest.java
===================================================================
--- trunk/equanda-client/src/test/java/org/equanda/persistence/EquandaListTest.java 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-client/src/test/java/org/equanda/persistence/EquandaListTest.java 2008-12-17 09:39:57 UTC (rev 914)
@@ -1,6 +1,7 @@
package org.equanda.persistence;
import junit.framework.TestCase;
+import org.equanda.client.EquandaException;
import java.util.ArrayList;
import java.util.Collection;
@@ -275,11 +276,11 @@
public DummyProxy equandaClone( boolean cloneUoid ) { return null; }
public void equandaUpdate()
- throws EquandaPersistenceException
+ throws EquandaException
{}
public void equandaUpdate( boolean updateTypeFieldsOnly )
- throws EquandaPersistenceException
+ throws EquandaException
{}
public String getEquandaStatus() { return null; }
@@ -293,7 +294,7 @@
public boolean isModified( boolean type ) { return false; }
public void equandaReset()
- throws EquandaPersistenceException
+ throws EquandaException
{/*nothing to do, just assure this can be compiled*/}
public String getDistinct()
Modified: trunk/equanda-generate/src/main/velocity/docs/ProxyInterface.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs/ProxyInterface.java.vm 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-generate/src/main/velocity/docs/ProxyInterface.java.vm 2008-12-17 09:39:57 UTC (rev 914)
@@ -33,12 +33,12 @@
package ${package}.client;
+import org.equanda.client.EquandaException;
import org.equanda.persistence.Uoid;
import org.equanda.persistence.ObjectType;
import org.equanda.persistence.EquandaList;
import org.equanda.persistence.EquandaProxy;
-import org.equanda.persistence.EquandaPersistenceException;
-import org.equanda.persistence.ExceptionCodes;
+import org.equanda.client.ExceptionCodes;
import java.util.Arrays;
import java.util.Collection;
@@ -82,7 +82,7 @@
* $field.Description
*/
public $fieldtype get${field.Name}()
- throws EquandaPersistenceException;
+ throws EquandaException;
#if( $field.isBoolean() )
/**
@@ -106,24 +106,24 @@
* $action.Description
*/
public $action.Return ${action.Name}( $action.ParametersListWithTypes )
- throws EquandaPersistenceException;
+ throws EquandaException;
#end
public void equandaUpdate( boolean updateTypeFieldsOnly )
- throws EquandaPersistenceException;
+ throws EquandaException;
/**
* Reset the proxy state. If the proxy was not modified, nothing happens, otherwise the state is retrieved from the
* server again.
*
- * @throws EquandaPersistenceException oops
+ * @throws EquandaException oops
*/
public void equandaReset()
- throws EquandaPersistenceException;
+ throws EquandaException;
#if( $table.hasSecurityRoleRemove() )
public void removeEntityBean()
- throws EquandaPersistenceException;
+ throws EquandaException;
#end
}
Modified: trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-generate/src/main/velocity/ejb3/DMObjectBean.java.vm 2008-12-17 09:39:57 UTC (rev 914)
@@ -31,10 +31,10 @@
package ${package}.server.pm;
+import org.equanda.client.EquandaException;
import org.equanda.persistence.Uoid;
import org.equanda.persistence.UoidGenerator;
import org.equanda.persistence.EquandaEntity;
-import org.equanda.persistence.EquandaPersistenceException;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.BatchSize;
import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -187,7 +187,7 @@
#end
public DM${table.Name}Bean(String type #foreach( $field in $table.ImmutableFields ), $field.JavaFieldType ${field.VarName}#end )
- throws EquandaPersistenceException
+ throws EquandaException
{
// initialise all CMP fields
#foreach( $field in $table.FieldsNotImmutableAndNotCalculated )
@@ -242,7 +242,7 @@
setEquandaStatus( "M" );
}
- protected DM${table.Name}Bean() throws EquandaPersistenceException {}
+ protected DM${table.Name}Bean() throws EquandaException {}
#foreach( $ck in $table.CascadeKeepNotBidirectional )
// CascadeKeep bidi $ck.isBidirectional() $ck.Name $ck.FieldName $ck.LinkedTableName
Modified: trunk/equanda-generate/src/main/velocity/ejb3/Mediator.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/Mediator.java.vm 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-generate/src/main/velocity/ejb3/Mediator.java.vm 2008-12-17 09:39:57 UTC (rev 914)
@@ -37,7 +37,7 @@
package ${package}.server;
-import org.equanda.persistence.EquandaPersistenceException;
+import org.equanda.client.EquandaException;
import java.util.Collection;
import java.util.ArrayList;
@@ -51,7 +51,7 @@
#if( !$field.isMultiple() )
#if( $field.isAuto() && $root.Name == $table.Name )
- protected $fieldtype auto${field.Name}() throws EquandaPersistenceException {
+ protected $fieldtype auto${field.Name}() throws EquandaException {
// @todo implementation to be provided
#set( $value="0" )
#if( $field.isString() || $field.isDate() || $field.isTimestamp() || $field.isLink() ) #set( $value="null" )
@@ -73,7 +73,7 @@
#else
#if( $field.isAuto() && $root.Name == $table.Name )
- protected Collection auto${field.Name}() throws EquandaPersistenceException {
+ protected Collection auto${field.Name}() throws EquandaException {
// @todo implementation to be provided
return new ArrayList();
}
@@ -91,7 +91,7 @@
#set( $sep=", " )
#set( $cnt=$cnt+1 )
#end
- ) throws EquandaPersistenceException {
+ ) throws EquandaException {
// @todo implementation to be provided
#if( $action.Return!="void" )
return
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm 2008-12-17 09:39:57 UTC (rev 914)
@@ -32,7 +32,7 @@
#if( $field.isMultiple() )
#if( !$field.isLink() )
public void add${field.Singular}( $fieldtype value )
- throws EquandaPersistenceException
+ throws EquandaException
{
if ( value == null )
{
@@ -60,7 +60,7 @@
}
public void remove${field.Singular}( $fieldtype value )
- throws EquandaPersistenceException
+ throws EquandaException
{
#* check constraints *#
#parse("MediatorBase-mutable.java.vm")
@@ -81,7 +81,7 @@
}
#else ## is link
public void addEquandaLink${field.Singular}( Uoid value )
- throws EquandaPersistenceException
+ throws EquandaException
{
if ( value == null )
{
@@ -114,7 +114,7 @@
}
public void removeEquandaLink${field.Singular}( Uoid value )
- throws EquandaPersistenceException
+ throws EquandaException
{
#* check constraints *#
#parse("MediatorBase-mutable.java.vm")
@@ -155,7 +155,7 @@
#else ## is single
#if( !$field.isLink() )
public void set${field.Name}( $fieldtype $field.VarName )
- throws EquandaPersistenceException
+ throws EquandaException
{
#if( $field.Name == "Password" && $field.isString() )
if ( null == $field.VarName || "".equals( $field.VarName ) ) return;
@@ -221,7 +221,7 @@
#else ## is link
public void setEquandaLink${field.Name}( Uoid value )
- throws EquandaPersistenceException
+ throws EquandaException
{
#* do nothing if values are equals *#
if ( testEquals( getEquandaLink${field.Name}(), value ) ) return;
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2008-12-17 09:28:59 UTC (rev 913)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2008-12-17 09:39:57 UTC (rev 914)
@@ -43,10 +43,10 @@
package ${package}.server;
import org.apache.log4j.Logger;
+import org.equanda.client.EquandaException;
import org.equanda.persistence.Uoid;
import org.equanda.persistence.ObjectType;
import org.equanda.persistence.EquandaConstraintViolation;
-import org.equanda.persistence.EquandaPersistenceException;
import ${package}.client.*;
import ${package}.server.pm.*;
@@ -59,7 +59,7 @@
#set( $parent="$!{table.ParentTable.Name}Mediator" )
#if( $parent=="Mediator" ) #set( $parent="${root.Name}MediatorRoot" ) #end
public abstract class ${table.Name}MediatorBase
- extends ${parent} implements org.equanda.persistence.ExceptionCodes
+ extends ${parent} implements org.equanda.client.ExceptionCodes
{
private static final Logger log = Logger.getLogger( ${table.Name}MediatorBase.class );
@@ -67,7 +67,7 @@
// fill in base (default) values when creating
public void create()
- throws EquandaPersistenceException
+ throws EquandaException
{
super.create();
// initialise auto fields - todo not sure if this is needed - it should have been done in ObjectBean.init
@@ -89,7 +89,7 @@
#parse("MediatorBase-set.java.vm")
protected void checkImmutableIf( String field, String exclude )
- throws EquandaPersistenceException
+ throws EquandaException
{
super.checkImmutableIf( field, exclude );
#if( $table.hasImmutableIf() )
@@ -110,7 +110,7 @@
* allow extra functionality when creating an object as a clone
*/
protected void equandaClone( DM${root.Name}Bean base )
- throws EquandaPersistenceException
+ throws EquandaException
{
#if( $table.Name != $table.Root.Name )super.equandaClone...
[truncated message content] |
|
From: <bri...@us...> - 2008-12-17 09:29:04
|
Revision: 913
http://equanda.svn.sourceforge.net/equanda/?rev=913&view=rev
Author: brian_reynolds
Date: 2008-12-17 09:28:59 +0000 (Wed, 17 Dec 2008)
Log Message:
-----------
Added text field which uses the autocomplete mixin to display available references (tml). Added an event handler for the autocomplete mixin (java). Still WIP
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2008-12-17 07:24:25 UTC (rev 912)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/Edit.java.vm 2008-12-17 09:28:59 UTC (rev 913)
@@ -269,5 +269,38 @@
#if( $field.hasLinkTypeCompare() )
public String get${field.Name}Filter() { return EquandaGlobal.getQueryString( "${table.Name}.equandaCompareType${field.Name}" ); }
#end
+
+#if( $field.isLink() && $field.getLinkTable().getFieldReference() )
+ private String selectedValue;
+ public String getSelectedValue()
+ {
+ return selectedValue;
+ }
+ public void setSelectedValue( String selectedValue )
+ {
+ this.selectedValue = selectedValue;
+ }
+
+ public List<String> onProvideCompletionsFromSelectedValue(String partial) {
+ List<String> matches = new ArrayList<String>();
+
+ try{
+ List<${ejbPackage}.client.${field.getLinkTable().getName()}> list = ${ejbPackage}.client.${field.getLinkTable().getName()}.selectEquandaReferenceStart(partial);
+
+ for( ${ejbPackage}.client.${field.getLinkTable().getName()} ref : list )
+ {
+ if( ref.getReference() != null || ref.getReference().length() != 0 )
+ matches.add( ref.getReference() );
+ }
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ return matches;
+ }
+
#end
+#end
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2008-12-17 07:24:25 UTC (rev 912)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/field.tml.vm 2008-12-17 09:28:59 UTC (rev 913)
@@ -41,5 +41,12 @@
<div class="eqFldC">${dollar}{equanda-message:field.${table.Name}.${field.Name}.caption}</div>
</t:if>
</div>
+
+#if( $field.isLink() && $field.getLinkTable().getFieldReference() )
+<div class="autocomplete">
+<input t:type="TextField" t:mixins="autocomplete" t:id="selectedValue"/>
+</div>
+#end
+
</t:if>
#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-17 07:24:56
|
Revision: 912
http://equanda.svn.sourceforge.net/equanda/?rev=912&view=rev
Author: triathlon98
Date: 2008-12-17 07:24:25 +0000 (Wed, 17 Dec 2008)
Log Message:
-----------
improve demo
Modified Paths:
--------------
t5-equanda-example/pom.xml
t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java
t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
t5-equanda-example/src/main/webapp/css/style.css
Removed Paths:
-------------
t5-equanda-example/src/main/webapp/script/equanda.js
Modified: t5-equanda-example/pom.xml
===================================================================
--- t5-equanda-example/pom.xml 2008-12-11 08:46:23 UTC (rev 911)
+++ t5-equanda-example/pom.xml 2008-12-17 07:24:25 UTC (rev 912)
@@ -144,6 +144,6 @@
</pluginRepositories>
<properties>
- <tapestry-release-version>5.0.14</tapestry-release-version>
+ <tapestry-release-version>5.0.15</tapestry-release-version>
</properties>
</project>
Modified: t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java
===================================================================
--- t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java 2008-12-11 08:46:23 UTC (rev 911)
+++ t5-equanda-example/src/main/java/org/equanda/example/t5/pages/Start.java 2008-12-17 07:24:25 UTC (rev 912)
@@ -29,15 +29,28 @@
import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.example.t5.data.DemoTree;
import org.equanda.tapestry5.data.Tree;
-import org.equanda.tapestry5.data.FlattenedTree;
+import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-
-/** Start page of application example-t5. */
+/**
+ * Start page of application example-t5.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
public class Start
{
+ @Inject
+ @Path( "context:images/smiley.gif" )
+ private Asset smiley;
+
+ /** Current node of the tree. */
+ private Tree node;
+
+ private List<String> list;
+ private String current;
+
public Tree getNode()
{
return node;
@@ -48,15 +61,6 @@
this.node = node;
}
- /** Current node of the tree. */
- private Tree node;
-
-
-
- @Inject
- @Path( "context:images/smiley.gif" )
- private Asset smiley;
-
public Asset getSmiley()
{
return smiley;
@@ -89,4 +93,41 @@
return n;
}
+
+ public List<String> getList()
+ {
+ if ( null == list )
+ {
+ list = new ArrayList<String>();
+ list.add( "We" );
+ list.add( "need" );
+ list.add( "a" );
+ list.add( "long" );
+ list.add( "list" );
+ list.add( "of" );
+ list.add( "items" );
+ list.add( "to" );
+ list.add( "show" );
+ list.add( "the" );
+ list.add( "paging" );
+ list.add( "in" );
+ list.add( "action." );
+ }
+ return list;
+ }
+
+ public void setList( List<String> list )
+ {
+ this.list = list;
+ }
+
+ public String getCurrent()
+ {
+ return current;
+ }
+
+ public void setCurrent( String current )
+ {
+ this.current = current;
+ }
}
\ No newline at end of file
Modified: t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml
===================================================================
--- t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2008-12-11 08:46:23 UTC (rev 911)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2008-12-17 07:24:25 UTC (rev 912)
@@ -18,7 +18,7 @@
<span t:type="equanda/Tabs" t:id="maintabs">
<t:parameter name="title1">Accordion</t:parameter>
<t:parameter name="content1">
- <span t:type="equanda/Accordion" t:id="accordion">
+ <span t:type="equanda/Accordion" t:id="acc2">
<t:parameter name="title1">Menu First Part</t:parameter>
<t:parameter name="content1">
<p>Sample menu, the links don't do anything though...</p>
@@ -96,6 +96,20 @@
</table>
</p>
</t:parameter>
+ <t:parameter name="title5">PagedLoop</t:parameter>
+ <t:parameter name="content5">
+ <p>The PagedLoop component is very similar to a normal "loop" component, except that the items are
+ automatically split accross several "pages" and links are provided to sitch between these pages.</p>
+ <p>The full content of the looped list is included in the document and the switch between the pages is
+ fully handled client side.</p>
+
+ <br/>
+ <t:form>
+ <div t:type="equanda/JSPagedLoop" source="list" current="current">
+ <p>${current}</p>
+ </div>
+ </t:form>
+ </t:parameter>
</span>
<!--
Modified: t5-equanda-example/src/main/webapp/css/style.css
===================================================================
--- t5-equanda-example/src/main/webapp/css/style.css 2008-12-11 08:46:23 UTC (rev 911)
+++ t5-equanda-example/src/main/webapp/css/style.css 2008-12-17 07:24:25 UTC (rev 912)
@@ -32,6 +32,38 @@
border-right: 1px dashed black;
}
+.acc2_tit {
+ background-color: lightgray;
+ color: black;
+ height: 15px; /* overwritten by script */
+ font-weight: normal;
+ padding-left: 5px;
+ padding-top: 3px;
+ padding-bottom: 3px;
+ border-bottom: 1px solid white;
+ border-top: 1px solid black;
+ cursor: pointer;
+}
+
+.acc2_tit a:link,
+.acc2_tit a:hover,
+.acc2_tit a:active,
+.acc2_tit a:visited {
+ text-decoration: none;
+ color: black;
+}
+
+.acc2_atit {
+ font-weight: bold;
+}
+
+.acc2_ct {
+ padding: 10px 2px 10px 10px;
+
+ background-color: beige;
+ overflow: auto;
+}
+
body {
margin:0;
border:0;
@@ -43,7 +75,7 @@
#layout-right { position:static; width:100%; height:100%; left:200px; right:auto; top:0; bottom: 0; }
#layout-context { position:static; width:100%; height:auto; background-color: lightgray; text-align:center; }
#layout-info { position:static; width:100%; height:220px; } /* height should be corrected by script */
-#layout-main { position:static; height:100%; overflow:auto; overflow-y:scroll; background-color:white; padding: 5px; }
+#layout-main { position:static; overflow:auto; overflow-y:scroll; background-color:white; padding: 5px; }
iframe { display:block; clear:none; overflow:hidden; }
.submit {
Deleted: t5-equanda-example/src/main/webapp/script/equanda.js
===================================================================
--- t5-equanda-example/src/main/webapp/script/equanda.js 2008-12-11 08:46:23 UTC (rev 911)
+++ t5-equanda-example/src/main/webapp/script/equanda.js 2008-12-17 07:24:25 UTC (rev 912)
@@ -1,26 +0,0 @@
-function getWindowHeight()
-{
- var height = 0;
- if( typeof( window.innerWidth ) == 'number' ) {
- //Non-IE
- height = window.innerHeight;
- } else if( document.documentElement && ( document.documentElement.clientWidth || document.documentElement.clientHeight ) ) {
- //IE 6+ in 'standards compliant mode'
- height = document.documentElement.clientHeight;
- } else if( document.body && ( document.body.clientWidth || document.body.clientHeight ) ) {
- //IE 4 compatible
- height = document.body.clientHeight;
- }
- return height;
-}
-
-function setCssSizes()
-{
- var one = 15;
- var padTitle = 8; /* padding + border (top+bottom) for title */
- var padItem = 20; /* padding + border (top+bottom) for item */
- var total = getWindowHeight() - 4 * ( one + padTitle ) - padItem;
- var info = getWindowHeight() - document.getElementById("layout-context").getHeight();
- var main = info - 90 - 10;
- $( "applicationStyles" ).update( '.accordion_title { height:'+one+'px; } .accordion_content { height: '+total+'px; } #layout-info { height:'+info+'px; } #layout-main { height:'+main+'px; }' );
-}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-11 08:46:34
|
Revision: 911
http://equanda.svn.sourceforge.net/equanda/?rev=911&view=rev
Author: triathlon98
Date: 2008-12-11 08:46:23 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
EQ-159 auto update user/role cache on changes
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2008-12-11 08:02:23 UTC (rev 910)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2008-12-11 08:46:23 UTC (rev 911)
@@ -181,7 +181,7 @@
{
try
{
- be.synergetics.ca.login.LoginCache.setUser( user.getUserName() );
+ ${loginPackage}.LoginCache.setUser( user.getUserName() );
}
catch( Exception ex ) { log.error( ex, ex ); }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-12-11 08:02:46
|
Revision: 910
http://equanda.svn.sourceforge.net/equanda/?rev=910&view=rev
Author: triathlon98
Date: 2008-12-11 08:02:23 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
EQ-159 auto update user/role cache on changes
Modified Paths:
--------------
trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
trunk/equanda-generate/src/main/velocity/login/LoginCache.java.vm
trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
Modified: trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table
===================================================================
--- trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table 2008-12-10 11:00:50 UTC (rev 909)
+++ trunk/equanda-dm/src/main/resources/org/equanda/infrastructure/useradmin/EquandaUser.table 2008-12-11 08:02:23 UTC (rev 910)
@@ -62,6 +62,10 @@
<hide/>
</select>
+ <select name="Role">
+ <selection field="Roles"/>
+ </select>
+
<action name="login">
<description>
Action which should be called automatically when logging in.
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2008-12-10 11:00:50 UTC (rev 909)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase.java.vm 2008-12-11 08:02:23 UTC (rev 910)
@@ -1,3 +1,10 @@
+#** @vtlvariable name="dollar" type="java.lang.String" *#
+#** @vtlvariable name="package" type="java.lang.String" *#
+#** @vtlvariable name="packageDir" type="java.lang.String" *#
+#** @vtlvariable name="generationdate" type="java.lang.String" *#
+#** @vtlvariable name="readOnlyContext" type="boolean" *#
+#** @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
+#** @vtlvariable name="engine" type="org.equanda.generate.Generator" *#
#**
* This file is part of the equanda project.
*
@@ -35,6 +42,7 @@
package ${package}.server;
+import org.apache.log4j.Logger;
import org.equanda.persistence.Uoid;
import org.equanda.persistence.ObjectType;
import org.equanda.persistence.EquandaConstraintViolation;
@@ -53,6 +61,8 @@
public abstract class ${table.Name}MediatorBase
extends ${parent} implements org.equanda.persistence.ExceptionCodes
{
+ private static final Logger log = Logger.getLogger( ${table.Name}MediatorBase.class );
+
public String getEquandaName() { return "$table.Name"; }
// fill in base (default) values when creating
@@ -159,6 +169,25 @@
#end
#end
+#set( $loginPackage="" )
+#set( $loginPackage=$!{engine.getLoginConfig("package")} )
+#if( "x" != "$loginPackage" )
+ #if( "EquandaUser" == $table.Name )
+ ${loginPackage}.LoginCache.setUser( getUserName() );
+ #end
+ #if( "EquandaRole" == $table.Name )
+ ${loginPackage}.LoginCache.setRoleAuths( getRoleName(), new org.equanda.auth.ParsedAuthAndConfigProvider( getAuthAndConfig() ) );
+ for ( EquandaUser user : EquandaUser.selectRole( getId() ) )
+ {
+ try
+ {
+ be.synergetics.ca.login.LoginCache.setUser( user.getUserName() );
+ }
+ catch( Exception ex ) { log.error( ex, ex ); }
+ }
+
+ #end
+#end
super.equandaCheckRules();
}
}
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/login/LoginCache.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/login/LoginCache.java.vm 2008-12-10 11:00:50 UTC (rev 909)
+++ trunk/equanda-generate/src/main/velocity/login/LoginCache.java.vm 2008-12-11 08:02:23 UTC (rev 910)
@@ -1,3 +1,9 @@
+#** @vtlvariable name="dollar" type="java.lang.String" *#
+#** @vtlvariable name="package" type="java.lang.String" *#
+#** @vtlvariable name="packageDir" type="java.lang.String" *#
+#** @vtlvariable name="generationdate" type="java.lang.String" *#
+#** @vtlvariable name="readOnlyContext" type="boolean" *#
+#** @vtlvariable name="engine" type="org.equanda.generate.Generator" *#
#**
* This file is part of the equanda project.
*
@@ -42,8 +48,8 @@
public static final String USER_PREFIX = "/${package}/user/";
public static final String AUTH_USER_PREFIX = "/${package}/auth/user/";
public static final String AUTH_ROLE_PREFIX = "/${package}/auth/role/";
- private static final LoginCache me = new LoginCache();
- private static final EquandaCache<AuthAndConfigProvider> userAuthCache = new EquandaCache<AuthAndConfigProvider>()
+ private static final LoginCache ME = new LoginCache();
+ private static final EquandaCache<AuthAndConfigProvider> USER_AUTH_CACHE = new EquandaCache<AuthAndConfigProvider>()
{
protected AuthAndConfigProvider getObject( String key )
throws EquandaPersistenceException
@@ -51,13 +57,13 @@
String user = key;
int pos = user.lastIndexOf( '/' );
if ( pos > -1 ) user = user.substring( pos + 1 );
- LoginInfo li = me.get( user );
+ LoginInfo li = ME.get( user );
return new ParsedAuthAndConfigProvider(
li != null && li.getUser() != null ? li.getUser().getAuthAndConfig() : null );
}
};
- private static final EquandaCache<AuthAndConfigProvider> roleAuthCache = new EquandaCache<AuthAndConfigProvider>()
+ private static final EquandaCache<AuthAndConfigProvider> ROLE_AUTH_CACHE = new EquandaCache<AuthAndConfigProvider>()
{
protected AuthAndConfigProvider getObject( String key )
throws EquandaPersistenceException
@@ -73,7 +79,7 @@
private LoginCache() {}
- public static LoginCache getLoginCache() { return me; }
+ public static LoginCache getLoginCache() { return ME; }
protected LoginInfo getObject( String key )
throws EquandaPersistenceException
@@ -89,6 +95,21 @@
/**
* Add LoginInfo in cache for given username/password pair (from parent LoginModule)
* @param user username
+ * @return built LoginInfo object
+ * @throws EquandaPersistenceException oops
+ */
+ public static LoginInfo setUser( String user )
+ throws EquandaPersistenceException
+ {
+ String userKey = USER_PREFIX + user;
+ LoginInfo li = ME.getObject( user );
+ ME.set( userKey, li );
+ return li;
+ }
+
+ /**
+ * Add LoginInfo in cache for given username/password pair (from parent LoginModule)
+ * @param user username
* @param pass password
* @return built LoginInfo object
* @throws EquandaPersistenceException oops
@@ -159,27 +180,27 @@
return info;
}
- public static final AuthAndConfigProvider getRoleFromCache( String roleName )
+ public static AuthAndConfigProvider getRoleFromCache( String roleName )
throws EquandaPersistenceException
{
- return roleAuthCache.get( AUTH_ROLE_PREFIX + roleName );
+ return ROLE_AUTH_CACHE.get( AUTH_ROLE_PREFIX + roleName );
}
- public static final AuthAndConfigProvider getUserFromCache( String userName )
+ public static AuthAndConfigProvider getUserFromCache( String userName )
throws EquandaPersistenceException
{
- return userAuthCache.get( AUTH_USER_PREFIX + userName );
+ return USER_AUTH_CACHE.get( AUTH_USER_PREFIX + userName );
}
- public static final void setRoleAuths( String roleName, AuthAndConfigProvider aac )
+ public static void setRoleAuths( String roleName, AuthAndConfigProvider aac )
throws EquandaPersistenceException
{
- roleAuthCache.set( AUTH_ROLE_PREFIX + roleName, aac );
+ ROLE_AUTH_CACHE.set( AUTH_ROLE_PREFIX + roleName, aac );
}
- public static final void setUserAuths( String userName, AuthAndConfigProvider aac )
+ public static void setUserAuths( String userName, AuthAndConfigProvider aac )
throws EquandaPersistenceException
{
- userAuthCache.set( AUTH_USER_PREFIX + userName, aac );
+ USER_AUTH_CACHE.set( AUTH_USER_PREFIX + userName, aac );
}
}
Modified: trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm 2008-12-10 11:00:50 UTC (rev 909)
+++ trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm 2008-12-11 08:02:23 UTC (rev 910)
@@ -1,3 +1,9 @@
+#** @vtlvariable name="dollar" type="java.lang.String" *#
+#** @vtlvariable name="package" type="java.lang.String" *#
+#** @vtlvariable name="packageDir" type="java.lang.String" *#
+#** @vtlvariable name="generationdate" type="java.lang.String" *#
+#** @vtlvariable name="readOnlyContext" type="boolean" *#
+#** @vtlvariable name="engine" type="org.equanda.generate.Generator" *#
#**
* This file is part of the equanda project.
*
@@ -57,7 +63,6 @@
@Local(LoginEJBLocal.class)
@LocalBinding( jndiBinding = "${package}.LoginEJBLocal" )
@PermitAll
-@TransactionAttribute( TransactionAttributeType.REQUIRES_NEW )
public class LoginBean
implements LoginEJBLocal, Serializable
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
