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...> - 2009-12-03 22:11:37
|
Revision: 1184
http://equanda.svn.sourceforge.net/equanda/?rev=1184&view=rev
Author: triathlon98
Date: 2009-12-03 22:11:25 +0000 (Thu, 03 Dec 2009)
Log Message:
-----------
spelling fixes
Modified Paths:
--------------
trunk/src/site/wiki/dm.wiki
trunk/src/site/wiki/templates/ejb3.wiki
Modified: trunk/src/site/wiki/dm.wiki
===================================================================
--- trunk/src/site/wiki/dm.wiki 2009-12-02 21:12:04 UTC (rev 1183)
+++ trunk/src/site/wiki/dm.wiki 2009-12-03 22:11:25 UTC (rev 1184)
@@ -95,7 +95,7 @@
- *renderer* : indication of the renderer (and parameters) which should be used to render this fields. This overwrites the defaults.
- *priority* : priority for setting this field. When the proxies set/update the field values, this is by default done in an order based on the priority and the order in which the fields are declared in the domain model. Priority is a value between "1" and "9", with fields at priority "1" updated first and "9" updated last.
-Each field can be given a _description_ and semantic annotations using _subectory_.
+Each field can be given a _description_ and semantic annotations using _subjectory_.
A field can be marked as _internal_, _auto_ or _calculated_. Internal fields are not visible to the outside world. They are part of the entity beans and database representation, but have no getters or setters. Auto fields have got getters, but no setters, the values are initialized and maintained in the mediators. A calculated field also has only a getter, but it is calculated when requested, it has no database representation.
Modified: trunk/src/site/wiki/templates/ejb3.wiki
===================================================================
--- trunk/src/site/wiki/templates/ejb3.wiki 2009-12-02 21:12:04 UTC (rev 1183)
+++ trunk/src/site/wiki/templates/ejb3.wiki 2009-12-03 22:11:25 UTC (rev 1184)
@@ -1,7 +1,7 @@
h1. ejb3 templates
Domain model description options
-- (multiple) inheritance
+- inheritance
- declarative constraints
- programmed constraints
- int, double, string, blob, clob fields
@@ -26,10 +26,10 @@
As part of the generated classes, some powerful _data access objects_ (DAO's) are generated. These _proxies_ assure that access to the objects always behaves consistently, independent of whether access is local, remote, using a UserTransaction or not.
The proxies have the following advantages and behaviour.
- All multiple linked fields are lazy loaded. They are instaniated when the collection is first accessed.
-- Proxies can be saved and updated (using equandaUpdate() in place, the actual object stays the same though the data in it may change. However, linked objects which are updated because of casading update are replaced (see example velow)!
+- Proxies can be saved and updated (using equandaUpdate() in place, the actual object stays the same though the data in it may change. However, linked objects which are updated because of cascading update are replaced (see example velow)!
- All multiple fields in the proxies are always not-null. When there are no values in it, an empty collection is returned.
- All updates to proxies cascade. The linked records will also be updated when they are changed (though this only follows a path of changed objects, when object A links to object B which links to C and A and C are modified but B is not, then an update on A will not update C).
-- Multiple fields in proxies are intelligent. They record which elements are removed or updated and will not touch unmodified linked objects. If however, you assign a new collection to these fields, then part of the intelligence is no longer possible, making updates somewhat less efficient. Therefor it is recommend to not assign new collections.
+- Multiple fields in proxies are intelligent. They record which elements are removed or updated and will not touch unmodified linked objects. If however, you assign a new collection to these fields, then part of the intelligence is no longer possible, making updates somewhat less efficient. Therefore it is recommended not to assign new collections.
- Proxies are only marked as _modified_ if something has actually changed. Just assigning the current value in a field will not mark that field as modified.
- The "equandaCreate()" static method allows instantiation of a new object with all default values filled in.
- All selectors are available through static method on the proxy class. The results are lazy collections which are instantiated and refreshed automatically.
@@ -52,11 +52,11 @@
h2. How the domain model is generated
-A whole set of classes are being generated. To handle the inheritance, the inheritance tree is flattened and a "root-table" is created which contains all fields, actions, selectors for all the tables in the inhertance tree. When is distinction needs to be made, this is handled in the code.
+A whole set of classes are being generated. To handle the inheritance, the inheritance tree is flattened and a "root-table" is created which contains all fields, actions, selectors for all the tables in the inheritance tree. When a distinction needs to be made, this is handled in the code.
-The preferred way to access the data is through the proxies. These have names which equal the names of the root tables and allow remote access to the data, the selectors and actions while hiding the details of looking up beans etc. They are built to transparently instantiate fields when required.
+The preferred way to access the data is through the proxies. These have names which equal the names of the root tables and allow remote access to the data, selectors and actions while hiding the details of looking up beans etc. They are built to transparently instantiate fields when required.
-Alternatively, you can access the data though a set of session beans for each root table. One is the /ObjectSelectorBean/ which is stateless and allows executing the selectors which are defined. The second is the /ObjectBean/ which is a stateful session bean façade for the entity bean. To make accessing these beans slightly easier, there is a /EquandaGlobal/ class which (amongst other things) allows you to retrieve the beans.
+Alternatively, you can access the data through a set of session beans for each root table. One is the /ObjectSelectorBean/ which is stateless and allows executing the selectors which are defined. The second is the /ObjectBean/ which is a stateful session bean façade for the entity bean. To make accessing these beans slightly easier, there is a /EquandaGlobal/ class which (amongst other things) allows you to retrieve the beans.
For constraint checking a smart set of intermediate classes called "mediators" are used. These are built in such a way to assure the declarative constraints can be handled and updated when the generation is re-run, but constraints added by manual coding are also maintained. For this a /MediatorRoot/ is used to start by constraining all access (nothing allowed). Then for each class there is a /MediatorBase/ which contains the declarative constraints and a /Mediator/ which is supposed to be filled in by the used and contains the programmatic constraints.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-12-02 21:12:17
|
Revision: 1183
http://equanda.svn.sourceforge.net/equanda/?rev=1183&view=rev
Author: triathlon98
Date: 2009-12-02 21:12:04 +0000 (Wed, 02 Dec 2009)
Log Message:
-----------
0.9.4.1
Added Paths:
-----------
tags/0.9.4.1/
tags/0.9.4.1/equanda-client/pom.xml
tags/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
tags/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
tags/0.9.4.1/equanda-dm/pom.xml
tags/0.9.4.1/equanda-generate/pom.xml
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/summary-tml/linklist-short.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/templates.properties
tags/0.9.4.1/equanda-maven-plugin/pom.xml
tags/0.9.4.1/equanda-server/pom.xml
tags/0.9.4.1/equanda-t5gui/pom.xml
tags/0.9.4.1/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js
tags/0.9.4.1/equanda-t5navigation/pom.xml
tags/0.9.4.1/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java
tags/0.9.4.1/equanda-tapestry5/pom.xml
tags/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
tags/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java
tags/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
tags/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js
tags/0.9.4.1/equanda-tapestry5/src/site/site.xml
tags/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki
tags/0.9.4.1/equanda-test/pom.xml
tags/0.9.4.1/equanda-test/test-core/pom.xml
tags/0.9.4.1/equanda-test/test-ddltool/pom.xml
tags/0.9.4.1/equanda-test/test-gui-t5-test/pom.xml
tags/0.9.4.1/equanda-test/test-t5-ear/pom.xml
tags/0.9.4.1/equanda-test/test-t5-gui/pom.xml
tags/0.9.4.1/equanda-test/test-test/pom.xml
tags/0.9.4.1/equanda-tool/pom.xml
tags/0.9.4.1/equanda-util/pom.xml
tags/0.9.4.1/pom.xml
Removed Paths:
-------------
tags/0.9.4.1/equanda-client/pom.xml
tags/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
tags/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
tags/0.9.4.1/equanda-dm/pom.xml
tags/0.9.4.1/equanda-generate/pom.xml
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/Select.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/Summary.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
tags/0.9.4.1/equanda-generate/src/main/velocity/t5gui/templates.properties
tags/0.9.4.1/equanda-maven-plugin/pom.xml
tags/0.9.4.1/equanda-server/pom.xml
tags/0.9.4.1/equanda-t5gui/pom.xml
tags/0.9.4.1/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js
tags/0.9.4.1/equanda-t5navigation/pom.xml
tags/0.9.4.1/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java
tags/0.9.4.1/equanda-tapestry5/pom.xml
tags/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java
tags/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js
tags/0.9.4.1/equanda-tapestry5/src/site/site.xml
tags/0.9.4.1/equanda-test/pom.xml
tags/0.9.4.1/equanda-test/test-core/pom.xml
tags/0.9.4.1/equanda-test/test-ddltool/pom.xml
tags/0.9.4.1/equanda-test/test-gui-t5-test/pom.xml
tags/0.9.4.1/equanda-test/test-t5-ear/pom.xml
tags/0.9.4.1/equanda-test/test-t5-gui/pom.xml
tags/0.9.4.1/equanda-test/test-test/pom.xml
tags/0.9.4.1/equanda-tool/pom.xml
tags/0.9.4.1/equanda-util/pom.xml
tags/0.9.4.1/pom.xml
Deleted: tags/0.9.4.1/equanda-client/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-client/pom.xml 2009-09-17 12:02:44 UTC (rev 1150)
+++ tags/0.9.4.1/equanda-client/pom.xml 2009-12-02 21:12:04 UTC (rev 1183)
@@ -1,52 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.equanda</groupId>
- <artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.equanda</groupId>
- <artifactId>equanda-client</artifactId>
- <packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
- <name>equanda-client</name>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.equanda</groupId>
- <artifactId>equanda-util</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-aop</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/0.9.4.1/equanda-client/pom.xml (from rev 1182, branches/0.9.4.1/equanda-client/pom.xml)
===================================================================
--- tags/0.9.4.1/equanda-client/pom.xml (rev 0)
+++ tags/0.9.4.1/equanda-client/pom.xml 2009-12-02 21:12:04 UTC (rev 1183)
@@ -0,0 +1,52 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda</artifactId>
+ <version>0.9.4.1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-client</artifactId>
+ <packaging>jar</packaging>
+ <version>0.9.4.1</version>
+ <name>equanda-client</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Deleted: tags/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
===================================================================
--- branches/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2009-09-17 12:02:44 UTC (rev 1150)
+++ tags/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2009-12-02 21:12:04 UTC (rev 1183)
@@ -1,47 +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.client;
-
-/**
- * Configuration for a specific page.
- *
- * @author <a href="mailto:bri...@ri...">Brian Reynolds</a>
- */
-public interface AuthAndConfigPages
-{
- /**
- * Set whether this page has GUI Administration rights
- *
- * @param isGuiAdmin The value to set the GUI Admin flag to
- */
- void setIsGuiAdmin( boolean isGuiAdmin );
-
- /**
- * Set the role being used
- *
- * @param roleName The name of the role to be used, or null if no role selected
- */
- void setRoleName( String roleName );
-}
Copied: tags/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java (from rev 1159, branches/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java)
===================================================================
--- tags/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java (rev 0)
+++ tags/0.9.4.1/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2009-12-02 21:12:04 UTC (rev 1183)
@@ -0,0 +1,47 @@
+/**
+ * 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;
+
+/**
+ * Configuration for a specific page.
+ *
+ * @author <a href="mailto:bri...@ri...">Brian Reynolds</a>
+ */
+public interface AuthAndConfigPages
+{
+ /**
+ * Set whether this page has GUI Administration rights
+ *
+ * @param isGuiAdmin The value to set the GUI Admin flag to
+ */
+ void setGuiAdmin( boolean isGuiAdmin );
+
+ /**
+ * Set the role being used
+ *
+ * @param roleName The name of the role to be used, or null if no role selected
+ */
+ void setRoleName( String roleName );
+}
Deleted: tags/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
===================================================================
--- branches/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt 2009-09-17 12:02:44 UTC (rev 1150)
+++ tags/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt 2009-12-02 21:12:04 UTC (rev 1183)
@@ -1,997 +0,0 @@
-;Last edited: 2007-06-03
-.languages en;nl;ro;fr
-.key 90000/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 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 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 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 90004/equanda-exceptions
-.label.en Cannot initialize bean
-.label.nl Kan bean niet initializeren
-.label.ro Bean-ul nu se poate initializa
-.label.fr Initialisation du bean non reusit
-.key 91001/equanda-exceptions
-.label.en Could not test choice $1 for field $$2 using class $3
-.label.nl Kan waarde $1 niet verifieren voor veld $$2 met klasse $3
-.label.ro Nu se poate testa alegerea $1 pentru campul $$2 folosind clasa $3
-.label.fr Peut pas controler le valeur $1 pour champs $$2 avec classe $3
-.key 91002/equanda-exceptions
-.label.en Value $1 is not one of the choices for field $$2
-.label.nl Waarde $1 is niet 1 van de keuzes voor veld $$2
-.label.ro Valoare $1 nu este una dintre optiunii $$2
-.label.fr $1 n'est pas une des choix pour champ $$2
-.key 91003/equanda-exceptions
-.label.en Compare constraint $1 not satisfied for field $$2 by value $3
-.label.nl Vergelijkingsconstraint $1 niet voldoende voor veld $$2 door waarde $3
-.label.ro Constrangerea de comparare $1 nu a fost valida pentru campul $$2 prin valoare $3
-.label.fr Constraint de comparaison $1 pas satisfait pour champs $$2 au valeur $3
-.key 91004/equanda-exceptions
-.label.en Field $$1 Immutable when field $$2 is set
-.label.nl Veld $$1 onveranderbaar wanneer veld $$2 is ingevuld
-.label.ro Campul $$1 este imutabil atunci cand campul $$2 este setat
-.label.fr Champ $$1 inmutable quand champ $$2 est rempli
-.key 91005/equanda-exceptions
-.label.en Cannot add null to multiple field $$1
-.label.nl Kan geen null toevoegen aan veld $$1
-.label.ro Nu se poate adauga null la un camp multiplu $$1
-.label.fr Ne peut pas ajouter null au champ $$1
-.key 91006/equanda-exceptions
-.label.en $$1 is required
-.label.nl $$1 is verplicht
-.label.ro $$1 este necesar
-.label.fr $$1 est néccessaire
-.key 91007/equanda-exceptions
-.label.en $$1 is unique
-.label.nl $$1 is uniek
-.label.ro $$1 este unic
-.label.fr $$1 est unique
-.key 91008/equanda-exceptions
-.label.en Include-value for field $$1 has wrong type
-.label.nl Inclusief-waarde voor veld $$1 heeft verkeerde type
-.label.ro Include-value pentru campul $$1 are tipul gresit
-.label.fr Valeur-inclusive pour champ $$1 a un type incorrect
-.key 91009/equanda-exceptions
-.label.en Failed to create included value for field $$1
-.label.nl Aanmaken inbegrepen waarde voor veld $$1 mislukt
-.label.ro Eroare la crearea valorii included-value pentru campul $$1
-.label.fr Création valeur inclusive pour champ $$1 échoué
-.key 91010/equanda-exceptions
-.label.en Internal error on create included value
-.label.nl Interne fout bij aanmaak inbegrepen waarde
-.label.ro Eroare interna la crearea valorii
-.label.fr Erreur interne chez création valeur inclusive
-.key 91011/equanda-exceptions
-.label.en Constraint violation for field $$1
-.label.nl Constraint violation voor veld $$1
-.label.ro Incalcarea cnstrangerilor pt campul $$1
-.label.fr Constraint violation pour champ $$1
-.key 91012/equanda-exceptions
-.label.en Failed to update value
-.label.nl Updaten van waarde mislukt
-.label.ro Eroare la salvarea valorii modificate
-.label.fr Update de la valeur échoué
-.key 91013/equanda-exceptions
-.label.en downCast Failed- cannot downCast root
-.label.nl downCast mislukt - kan root niet downCasten
-.label.ro eroare la downCast- nu se poate face downCast la radacina
-.label.fr downCast échoué - downCast pas possible au root
-.key 91014/equanda-exceptions
-.label.en downCast selector error
-.label.nl downCast selector fout
-.label.ro downCast eroare la cautare
-.label.fr downCast selector faute
-.key 91015/equanda-exceptions
-.label.en downCast create error
-.label.nl downCast create fout
-.label.ro downCast eroare la creare
-.label.fr downCast creat faute
-.key 91017/equanda-exceptions
-.label.en Invalid table type $$1 for table $$2
-.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
-.label.ro Datele au fost deja modificate
-.label.fr Données sont déjà changées
-.key 93001/equanda-exceptions
-.label.en Operation is not allowed
-.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
-.label.ro Actiune
-.label.fr Action
-.key ActionsSection/equanda-fixed
-.label.en Actions
-.label.nl Acties
-.label.ro Sectiunea pt. Actiune
-.label.fr Actions
-.key Add/equanda-fixed
-.label.en Add
-.label.nl Toevoegen
-.label.ro Adauga
-.label.fr Ajouter
-.key Add-Continue/equanda-fixed
-.label.en Add (Continue)
-.label.nl Toevoegen (volgende)
-.label.ro Adauga (Continua)
-.label.fr Ajouter (encore)
-.key Add-Select/equanda-fixed
-.label.en Add (Select)
-.label.nl Toevoegen
-.label.ro Adauga (Selecteaza)
-.label.fr Ajouter
-.key Add-View/equanda-fixed
-.label.en Add (View)
-.label.nl Toevoegen
-.label.ro Adauga (Vizualizare)
-.label.fr Ajouter
-.key Back/equanda-fixed
-.label.en Back
-.label.nl Terug
-.label.ro Inapoi
-.label.fr Retour
-.key BackToEdit/equanda-fixed
-.label.en Back to edit
-.label.nl Terug naar wijzigen
-.label.ro Inapoi la editare
-.label.fr Retour vers editer
-.key BorderConfig/equanda-fixed
-.label.en Configure Border
-.label.nl Configureer Border
-.label.ro Configurare Border
-.label.fr Configurer Border
-.key CaseLower/equanda-fixed
-.label.en Lower
-.label.nl Kleine letters
-.label.ro Minuscule
-.label.fr Miniscules
-.key CaseMixed/equanda-fixed
-.label.en Mixed
-.label.nl Gemengd
-.label.ro Combinat
-.label.fr Mixed
-.key CaseUpper/equanda-fixed
-.label.en Upper
-.label.nl Hoofdletters
-.label.ro Majuscule
-.label.fr Majuscules
-.key Category/equanda-fixed
-.label.en Category
-.label.nl Categorie
-.label.ro Categorie
-.label.fr Categorie
-.key ChangePassword/LoginMenu
-.label.en Change password
-.label.nl Wijzig paswoord
-.label.ro Schimba parola
-.label.fr Changez mot de passe
-.key ChangePassword/equanda-fixed
-.label.en Change password
-.label.nl Change password
-.label.ro Schimba parola
-.label.fr Change password
-.key CheckAll/Alerts
-.label.en Check all
-.label.nl Alle
-.label.ro Selecteaza toate
-.label.fr Tous
-.key ClearAll/Alerts
-.label.en Clear all
-.label.nl Geen
-.label.ro Deselecteaza toate
-.label.fr Rien
-.key Clone/equanda-fixed
-.label.en Clone
-.label.nl Dupliceer
-.label.ro Cloneaza
-.label.fr Duplicer
-.key Clone-Save/equanda-fixed
-.label.en Clone (Save)
-.label.nl Kloon (opslaan)
-.label.ro Cloneaza (Salvare)
-.label.fr Clone (sauvegarder)
-.key Close/equanda-fixed
-.label.en Close
-.label.nl Sluiten
-.label.ro Inchide
-.label.fr Fermer
-.key CurrentUserNotInTable/equanda-fixed
-.label.en Logged in with temporary user (not in users table)
-.label.nl Ingelogd met voorlopige gebruiker (niet in gebruikerstabel)
-.label.ro Logare cu user temporar (nu este adaugat in baza de date)
-.label.fr Utilisateur active est temporaire (pas dans fichier d'utilisateurs)
-.key CustomQuery/equanda-fixed
-.label.en Custom query
-.label.ro Interogare configurabila
-.key Detail/equanda-fixed
-.label.en Detail
-.label.nl Detail
-.label.ro Detaili
-.label.fr Detail
-.key Edit/equanda-fixed
-.label.en Edit
-.label.nl Wijzigen
-.label.ro Editeaza
-.label.fr Editer
-.key EnterNewPassword/ChangePassword
-.label.en Enter new password
-.label.nl Nieuw paswoord ingeven
-.label.ro Introduceti noua parola
-.label.fr Introduisez nouveau mot de passe
-.key EnterNewPassword/equanda-fixed
-.label.en Enter new password
-.label.nl Enter new password
-.label.ro Introduceti noua parola
-.label.fr Enter new password
-.key Field/equanda-fixed
-.label.en Field
-.label.nl Veld
-.label.ro Camp
-.label.fr Champ
-.key FieldsSection/equanda-fixed
-.label.en Fields
-.label.nl Velden
-.label.ro Campuri
-.label.fr Champs
-.key Select/Alerts
-.label.en Select
-.label.nl Zoeken
-.label.ro Cauta
-.label.fr Trouver
-.key Select/equanda-fixed
-.label.en Select
-.label.nl Zoek
-.label.ro Cauta
-.label.fr Cherche
-.key AddSelected/equanda-fixed
-.label.en Add selected objects
-.label.nl Toevoegen geselecteerde objecten
-.label.fr Ajouter objects selectés
-.key Group/equanda-fixed
-.label.en Group
-.label.nl Groep
-.label.ro Grup
-.label.fr Groupe
-.key HideInactiveRecords/equanda-fixed
-.label.en Hide inactive records
-.label.ro Ascunde inregistrarile inactive
-.key Ignore/Alerts
-.label.en Ignore
-.label.nl Negeer
-.label.ro Ignora
-.label.fr Ignorer
-.key Index/equanda-fixed
-.label.en Index
-.label.nl Index
-.label.ro Index
-.label.fr Index
-.key Insert/equanda-fixed
-.label.en Insert
-.label.nl Invoegen
-.label.ro Insereaza
-.label.fr Inserer
-.key InvalidDate/equanda-fixed
-.label.en Invalid value for date
-.label.nl Ongeldige waarde voor datum
-.label.ro Valuare invalida pt data
-.label.fr Format non valide pour date
-.key InvalidDouble/equanda-fixed
-.label.en Invalid double value
-.label.nl Ongeldig decimaal getal
-.label.ro Valoare invalida pt numar zecimal
-.label.fr Valeur decimale non valide
-.key InvalidInteger/equanda-fixed
-.label.en Invalid integer value
-.label.nl Ongeldig getal
-.label.ro Valoare invalida pt numar intreg
-.label.fr Nombre non valide
-.key InvalidUserPassword/ChangePassword
-.label.en Invalid user/password
-.label.nl Ongeldige gebruiker/paswoord
-.label.ro User/parola invalide
-.label.fr Utilisateur/mot de pas non vallable
-.key InvalidUserPassword/equanda-fixed
-.label.en Invalid user/password
-.label.nl Invalid user/password
-.label.ro Utilizator/parola invalida
-.label.fr Invalid user/password
-.key IsRequired/equanda-fixed
-.label.en Value is required
-.label.nl Waarde is verplicht
-.label.ro Valuarea este necesara
-.label.fr Valeur obligatoire
-.key LinkedSelects/equanda-fixed
-.label.en Reverse links
-.label.nl Omgekeerde links
-.label.ro Link-uri inverse
-.label.fr Selections lié
-.key List/equanda-fixed
-.label.en List
-.label.nl Lijst
-.label.ro Lista
-.label.fr Liste
-.key Load/equanda-fixed
-.label.en Load
-.label.nl Laden
-.label.ro Incarca
-.label.fr Ouvrir
-.key Logout/LoginMenu
-.label.en Logout
-.label.nl Uitloggen
-.label.ro Logout
-.label.fr Logout
-.key Logout/equanda-fixed
-.label.en Logout
-.label.nl Logout
-.label.ro Logout
-.label.fr Logout
-.key MoreLinkedSelects/equanda-fixed
-.label.en More reverse links
-.label.nl Meer omgekeerde links
-.label.ro Alte linkuri inverse
-.label.fr Plus de sélections lié
-.key NoMessage/Alerts
-.label.en Alert with no message
-.label.nl Melding zonder boodschap
-.label.ro Alerta fara nici un mesaj
-.label.fr Alert sans message
-.key NoResults/equanda-fixed
-.label.en No results.
-.label.nl Geen resultaten.
-.label.ro Nu exista rezultate.
-.label.fr Pas de résultats.
-.key button.OK/equanda-fixed
-.label.en OK
-.label.nl OK
-.label.ro OK
-.label.fr OK
-.key OldPassword/ChangePassword
-.label.en Old password
-.label.nl Oud paswoord
-.label.ro Vechea parola
-.label.fr Vieux mot de passe
-.key OldPassword/equanda-fixed
-.label.en Old password
-.label.nl Old password
-.label.ro Parola veche
-.label.fr Old password
-.key OrderResultSizeDescription/equanda-fixed
-.label.en The maximum number of results per page
-.label.ro Numarul maxim de rezultate afisate per pagina
-.key OrderResultSizeLabel/equanda-fixed
-.label.en Results/page
-.label.ro Rezultate/pagina
-.key Page/equanda-fixed
-.label.en Page
-.label.nl Pagina
-.label.ro Pagina
-.label.fr Page
-.key Parameter/equanda-fixed
-.label.en Parameter
-.label.nl Parameter
-.label.ro Parametru
-.label.fr Paramétre
-.key PasswordsDontMatch/ChangePassword
-.label.en New and old passwords dont match
-.label.nl Nieuwe en oude paswoord komen niet overeen
-.label.ro Vechea si noua parola nu se potrivesc
-.label.fr Le nouveau en vieux mot de passe ne corresponde pas
-.key button.Print/equanda-fixed
-.label.en Print
-.label.nl Afdrukken
-.label.ro Tiparire
-.label.fr Imprimer
-.key PrintLandscape/equanda-fixed
-.label.en Print landscape
-.label.nl Afdrukken landscape
-.label.ro Tiparire orizontala
-.label.fr Imprimer landscape
-.key PrintPortrait/equanda-fixed
-.label.en Print portrait
-.label.nl Afdrukken portrait
-.label.ro Tiparire verticala
-.label.fr Imprimer portrait
-.key ReenterNewPassword/ChangePassword
-.label.en Reenter new password
-.label.nl Herhaal nieuw paswoord
-.label.ro Reintroduceti noua parola
-.label.fr Répétez nouveaumot de passe
-.key ReenterNewPassword/equanda-fixed
-.label.en Reenter new password
-.label.nl Reenter new password
-.label.ro Reintroduceti noua parola
-.label.fr Reenter new password
-.key button.Refresh/equanda-fixed
-.label.en Refresh
-.label.nl Refresh
-.label.ro Refresh
-.label.fr Refresh
-.key RefreshNeeded/equanda-fixed
-.label.en Object in the database has changed, refresh is needed
-.label.nl Object in database is gewijzigd, refresh is noodzakelijk
-.label.ro Obiectul in baza de date e modificat, e necesar un refresh
-.label.fr Object dans la base de données est changé, on a besoin d'un refresh
-.key button.Remove/equanda-fixed
-.label.en Remove
-.label.nl Verwijder
-.label.ro Sterge
-.label.fr Effacer
-.key Remove-Back/equanda-fixed
-.label.en Remove (Back)
-.label.nl Verwijder (terug)
-.label.ro Sterge (Inapoi)
-.label.fr Effacer (retour)
-.key Report/equanda-fixed
-.label.en Report
-.label.nl Rapport
-.label.ro Raport
-.label.fr Rapport
-.key ReportsConfig/equanda-fixed
-.label.en Configure list of reports
-.label.nl Configureer lijst rapporten
-.label.ro Configurarea listei de rapoarte
-.label.fr Configurer liste de rapports
-.key Resolve/Alerts
-.label.en Resolve
-.label.nl Oplossen
-.label.ro Rezolva
-.label.fr Résolur
-.key Result/equanda-fixed
-.label.en Result
-.label.nl Resultaat
-.label.ro Rezultate
-.label.fr Résultat
-.key Role/equanda-fixed
-.label.en Role
-.label.nl Rol
-.label.ro Rol
-.label.fr Role
-.key authAndConfig.title.Roles/equanda-fixed
-.label.en Configure Roles
-.key authAndConfig.title.Tables/equanda-fixed
-.label.en Configure Tables
-.key authAndConfig.configure/equanda-fixed
-.label.en Auth and Config settings for
-.key authAndConfig.label.Table/equanda-fixed
-.label.en Table Name
-.key authAndConfig.label.Read/equanda-fixed
-.label.en Read
-.key authAndConfig.label.Write/equanda-fixed
-.label.en Write
-.key authAndConfig.label.Delete/equanda-fixed
-.label.en Delete
-.key authAndConfig.label.Visible/equanda-fixed
-.label.en Visible
-.key authAndConfig.label.List/equanda-fixed
-.label.en List
-.key authAndConfig.label.Summary/equanda-fixed
-.label.en Summary
-.key authAndConfig.label.Print/equanda-fixed
-.label.en Print
-.key authAndConfig.label.Configure/equanda-fixed
-.label.en Configure
-.key authAndConfig.label.Enable/equanda-fixed
-.label.en Enable
-.key authAndConfig.select.Role/equanda-fixed
-.label.en Choose the role you wish to edit, or leave blank to edit the current user.
-.key authAndConfig.select.Prohibited/equanda-fixed
-.label.en This user is prohibited from accessing this page.
-.key button.Save/equanda-fixed
-.label.en Save
-.label.nl Opslaan
-.label.ro Salveaza
-.label.fr Sauvegarder
-.key Save-Select/equanda-fixed
-.label.en Save (Select)
-.label.nl Opslaan
-.label.ro Salveaza (Selecteaza)
-.label.fr Sauvegarder
-.key Save-View/equanda-fixed
-.label.en Save (View)
-.label.nl Opslaan
-.label.ro Salveaza (Vizualizare)
-.label.fr Sauvegarder
-.key Select/equanda-fixed
-.label.en Select
-.label.nl Selecteer
-.label.ro Selecteaza
-.label.fr Sélecter
-.key SelectAll/equanda-fixed
-.label.en Select all
-.label.nl Selecteer alle
-.label.ro Selecteaza tot
-.label.fr Selector tous
-.key SelectsSection/equanda-fixed
-.label.en Selects
-.label.nl Selecties
-.label.ro Sectiunea pt cautare
-.label.fr Selections
-.key SetAllToFullRights/equanda-fixed
-.label.en Set all to full rights
-.label.nl Alle rechten aanzetten
-.label.ro Acorda drepturi totale
-.label.fr Activer tous les droits
-.key SetAllToNoRights/equanda-fixed
-.label.en Set all to no rights
-.label.nl Alle rechten afzetten
-.label.ro Nu acorda nici un drept
-.label.fr Desactiver tous les droits
-.key ShowWarnings/Alerts
-.label.en Show warnings
-.label.nl Waarschuwingen weergeven
-.label.ro Arata avertismentele
-.label.fr Visualiser cautions
-.key StartPage/equanda-fixed
-.label.en Start page
-.label.nl Startpagina
-.label.ro Pagina de start
-.label.fr Page d'accueil
-.key StartPageConfig/equanda-fixed
-.label.en Configure start page for GUI
-.label.nl Startpagina instellen
-.label.ro Configurarea paginii de start
-.label.fr Configurere page d'accueil
-.key Table/equanda-fixed
-.label.en Table
-.label.nl Tabel
-.label.ro Tabela
-.label.fr Table
-.key TableType/equanda-fixed
-.label.en Record type
-.label.nl Record type
-.label.ro Tipul inregistrarii
-.label.fr Type de données
-.key TablesConfig/equanda-fixed
-.label.en Configure list of tables
-.label.nl Configureer lijst van tabellen
-.label.ro Configurarea listei de tabele
-.label.fr Configurer liste de tables
-.key UOID/equanda-fixed
-.label.en UOID
-.label.nl UOID
-.label.ro UOID
-.label.fr UOID
-.key UnselectAll/equanda-fixed
-.label.en Unselect all
-.label.nl Deselecteer alles
-.label.ro Deselecteaza tot
-.label.fr Deselecteer tous
-.key UserAdminBlockToAllActions/equanda-fixed
-.label.en Set all actions to 'Block'
-.label.nl Alle acties verbergen
-.label.ro Seteaza toate actiunile pe 'Block'
-.label.fr Bloquer toutes les actions
-.key UserAdminBlockToAllSelects/equanda-fixed
-.label.en Set all selects to 'Block'
-.label.nl Alle selecties blokkeren
-.label.ro Seteaza toate cautarile pe 'Block'
-.label.fr Bloquer toutes les selections
-.key UserAdminEditToAllFields/equanda-fixed
-.label.en Set all fields to 'Edit'
-.label.nl Alle velden laten editeren
-.label.ro Seteaza toate campurile pe 'Edit'
-.label.fr Editer possible pour toutes les champs
-.key UserAdminNoneToAllFields/equanda-fixed
-.label.en Set all fields to 'None'
-.label.nl Alle velden verbergen
-.label.ro Seteaza toate campurile pe 'None'
-.label.fr Marker toutes les champs comme invisible
-.key UserAdminRunToAllActions/equanda-fixed
-.label.en Set all actions to 'Run'
-.label.nl Alle acties toelaten
-.label.ro Seteaza toate actiunile pe 'Run'
-.label.fr Permettre toutes les actions
-.key UserAdminRunToAllSelects/equanda-fixed
-.label.en Set all selects to 'Run'
-.label.nl Alle selecties toelaten
-.label.ro Seteaza toate cautarile pe 'Run'
-.label.fr Permettre toutes les selections
-.key UserAdminViewToAllFields/equanda-fixed
-.label.en Set all fields to 'View'
-.label.nl Alle velden alleen weergeven
-.label.ro Seteaza toate campurile pe 'View'
-.label.fr Toutes les champs visible (pas éditer)
-.key UserName/equanda-fixed
-.label.en User name
-.label.nl Gebruiker
-.label.ro Numele Utilizatorului
-.label.fr Utilisateur
-.key View/equanda-fixed
-.label.en View
-.label.nl Bekijken
-.label.ro Vizualizeaza
-.label.fr Visualiser
-.key accesskey.add-continue/equanda-fixed
-.label.en A
-.label.nl A
-.label.ro A
-.label.fr A
-.key accesskey.back/equanda-fixed
-.label.en B
-.label.nl T
-.label.ro B
-.label.fr R
-.key accesskey.clone/equanda-fixed
-.label.en C
-.label.nl K
-.label.ro C
-.label.fr C
-.key accesskey.edit/equanda-fixed
-.label.en E
-.label.nl E
-.label.ro E
-.label.fr E
-.key accesskey.refresh/equanda-fixed
-.label.en F
-.label.nl F
-.label.ro F
-.label.fr F
-.key accesskey.remove/equanda-fixed
-.label.en R
-.label.nl D
-.label.ro R
-.label.fr E
-.key accesskey.save/equanda-fixed
-.label.en S
-.label.nl O
-.label.ro S
-.label.fr S
-.key accesskey.select/equanda-fixed
-.label.en H
-.label.nl H
-.label.ro H
-.label.fr H
-.key detail.button.addlines/MasterDetailPage
-.label.en Add Lines
-.caption.en Add more lines
-.label.nl Extra Lijnen
-.caption.nl Lijnen toevoegen
-.label.ro Adauga Linii
-.caption.ro Adauga una sau mai multe linii
-.label.fr Ajouter Lignes
-.caption.fr Ajouter lignes
-.key detail.button.addlines.accesskey/MasterDetailPage
-.label.en A
-.label.nl L
-.label.ro A
-.label.fr L
-.key detail.button.insertLine/MasterDetailPage
-.label.en Insert
-.label.nl Invoegen
-.label.ro Insereaza
-.label.fr Inserer
-.key detail.button.insertLine.title/MasterDetailPage
-.label.en Insert a new line
-.label.nl Lijn invoegen
-.label.ro Insereaza o noua linie
-.label.fr Inserer ligne
-.key detail.button.removeLine/MasterDetailPage
-.label.en Remove
-.label.nl Verwijder
-.label.ro Sterge
-.label.fr Effacer
-.key detail.button.removeLine.title/MasterDetailPage
-.label.en Remove Line
-.label.nl Verwijder lijn
-.label.ro Sterge Linie
-.label.fr Effacer ligne
-.key detail.fieldset/MasterDetailPage
-.label.en Detail Lines
-.label.nl Details
-.label.ro Linii de detalii
-.label.fr Details
-.key details/TablePreferencesPage
-.label.en Details
-.label.nl Detail
-.label.ro Detalii
-.label.fr D?tail
-.key error.reference.not.found/ViewPageRedirector
-.label.en Reference not found
-.label.ro Referinta negasita
-.key import.result.OK/Import
-.label.en OK
-.label.nl OK
-.label.ro OK
-.label.fr OK
-.key masterDetail.button.back/MasterDetailPage
-.label.en Back
-.caption.en Go back
-.label.nl Terug
-.caption.nl Terug
-.label.ro Inapoi
-.caption.ro Inapoi
-.label.fr Retour
-.caption.fr Retour
-.key masterDetail.button.back.accesskey/MasterDetailPage
-.label.en X
-.label.nl X
-.label.ro X
-.label.fr X
-.key button.Cancel/equanda-fixed
-.label.en Cancel
-.label.nl Annuleer
-.label.ro Anulare
-.label.fr Annuler
-.key button.Reset/equanda-fixed
-.label.en Reset
-.label.nl Herstel
-.label.fr Remise
-.key button.Delete/equanda-fixed
-.label.en Delete
-.label.nl Verwijder
-.label.fr Supprimer
-.key masterDetail.button.cancel.accesskey/MasterDetailPage
-.label.en E
-.label.nl W
-.label.ro E
-.label.fr A
-.key button.Create/equanda-fixed
-.label.en Create
-.caption.en Create a new object
-.label.nl Toevoegen
-.caption.nl Nieuw object aanmaken
-.label.ro Creaza
-.caption.ro Creaza o noua inregistrare
-.label.fr Ajouter
-.caption.fr Creér nouvelle objet
-.key masterDetail.button.create.accesskey/MasterDetailPage
-.label.en C
-.label.nl C
-.label.ro R
-.label.fr C
-.key masterDetail.button.createContinue/MasterDetailPage
-.label.en Create/Continue
-.caption.en Save and create another one
-.label.nl Aanmaken/nieuw
-.caption.nl Opslaan en nieuwe aanmaken
-.label.ro Creaza/Continua
-.caption.ro Creaza o noua inregistrare folosind aceasta inregistrare ca sablon
-.label.fr Créer/nouveau
-.caption.fr Sauvegarder et creér une autre
-.key masterDetail.button.createContinue.accesskey/MasterDetailPage
-.label.en N
-.label.nl N
-.label.ro N
-.label.fr N
-.key masterDetail.button.createTemplate/MasterDetailPage
-.label.en Create Template
-.caption.en Create a new record using this as template
-.label.nl Nieuw Template
-.caption.nl Nieuwe gegevens aanmaken met deze als template
-.label.ro Creaza Dupa Sablon
-.caption.ro Creaza o noua inregistrare folosind aceasta inregistrare ca sablon
-.label.fr Nouveau template
-.caption.fr Ajouter nouveaux données avec celle ci comme template
-.key masterDetail.button.createTemplate.accesskey/MasterDetailPage
-.label.en T
-.label.nl T
-.label.ro T
-.label.fr T
-.key masterDetail.button.save/MasterDetailPage
-.label.en Save
-.caption.en Save the current modifications
-.label.nl Opslaan
-.caption.nl Opslaan
-.label.ro Salveaza
-.caption.ro Salveaza modificarile curente
-.label.fr Sauvegarder
-.caption.fr Sauvegarder
-.key masterDetail.button.save.accesskey/MasterDetailPage
-.label.en S
-.label.nl S
-.label.ro S
-.label.fr S
-.key masterDetail.button.stop/MasterDetailPage
-.label.en Stop
-.caption.en Go back to the declaration select page
-.label.nl Stop
-.label.ro Stop
-.caption.ro Inapoi la registrul de declaratii
-.label.fr Arrête
-.key masterDetail.button.stop.accesskey/MasterDetailPage
-.label.en X
-.label.nl X
-.label.ro X
-.label.fr X
-.key report/TablePreferencesPage
-.label.en Report
-.label.nl Rapport
-.label.ro Raport
-.label.fr Rapport
-.key reportResetAll/TablePreferencesPage
-.label.en All invisible in Report
-.label.nl Alles onzichtbaar in Rapport
-.label.ro Totul invizibil pt rapoarte
-.label.fr Tout invisible dans Rapport
-.key reportSetAll/TablePreferencesPage
-.label.en All visible in Report
-.label.nl Alles zichtbaar in Rapport
-.label.ro Totul vizibil pt rapoarte
-.label.fr Tout visible dans Rapport
-.key report_no/equanda-fixed
-.label.en No
-.label.nl Nee
-.label.ro Nu
-.label.fr Non
-.key report_yes/equanda-fixed
-.label.en Yes
-.label.nl Ja
-.label.ro Da
-.label.fr Oui
-.key select/TablePreferencesPage
-.label.en Select
-.label.nl Selecteer
-.label.ro Selectie
-.label.fr Sélectionné
-.key selectResetAll/TablePreferencesPage
-.label.en All invisible in Select
-.label.nl Alle gegevens onzichtbaar in selectie
-.label.ro Totul invizibil pt selectie
-.label.fr Tout invisible dans la sélection
-.key selectSetAll/TablePreferencesPage
-.label.en All visible in Select
-.label.nl Alle gegevens zichtbaar in selectie
-.label.ro Totul vizibil pt selectie
-.label.fr Tout visible dans la sélection
-.key page.Metadata/equanda-fixed
-.label.en Metadata
-.key title/AdminBorderConfig
-.label.en Configure Border
-.label.nl Configureer rand
-.label.ro Configureaza Border
-.label.fr Configuration bordure
-.key title/AdminMenu
-.label.en Administrator menu
-.label.nl Administrator menu
-.label.ro Meniu Administrator
-.label.fr Menu d'administrateur
-.key title/AdminReportsConfig
-.label.en Configure list of reports
-.label.nl Configureer rapportenlijst
-.label.ro Configureaza lista de rapoarte
-.label.fr Configuration liste des rapports
-.key title/AdminTablesConfig
-.label.en Configure list of visible tables
-.label.nl Configureer lijst van zichtbare tabellen
-.label.ro Configureaza lista de tabele vizibile
-.label.fr Configuration du liste des fichiers visible
-.key title/Alerts
-.label.en Alerts management
-.label.nl Meldingen beheer
-.label.ro Administrare Alerte
-.label.fr Management Alert
-.key title/Import
-.label.en Import
-.label.nl Import
-.label.ro Import
-.label.fr Importation
-.key title/LoginMenu
-.label.en Login menu
-.label.nl Login menu
-.label.ro Meniu de login
-.label.fr Menu login
-.key title/TablePreferencesPage
-.label.en Preferences for
-.label.nl Voorkeuren voor
-.label.ro Preferinte pentru
-.label.fr Préférences pour
-.key title/TableRightsPage
-.label.en Rights for
-.label.nl Rechten voor
-.label.ro Depturi pentru
-.label.fr Droits pour
-.key title/UserBorderConfig
-.label.en Configure Border
-.label.nl Configureer rand
-.label.ro Configureaza Border
-.label.fr Configuration bordure
-.key title/UserMenu
-.label.en User menu
-.label.nl Gebruiker menu
-.label.ro Meniu Utilizator
-.label.fr Menu d'utilisateur
-.key title/UserReportsConfig
-.label.en Configure list of reports
-.label.nl Configureer rapportenlijst
-.label.ro Configureaza lista de rapoarte
-.label.fr Configuration du liste des rapports
-.key title/UserTablesConfig
-.label.en Configure list of visible tables
-.label.nl Configureer lijst van zichtbare tabellen
-.label.ro Configureaza lista de tabele vizibile
-.label.fr Configuration du leste des fichiers visible
-.key title/ViewNavigationStack
-.label.en View navigation stack
-.label.nl Bekijk navigatiestapel
-.label.ro Afisarea navigator
-.label.fr Voir pile de navigation
-.key title/ViewPageRedirector
-.label.en Redirector
-.label.ro Redirector
-.key field.EquandaType/equanda-fixed
-.label.en Type
-.label.nl Type
-.label.fr Type
-.key field.EquandaId/equanda-fixed
-.label.en Id
-.label.nl Id
-.label.fr Id
-.key field.EquandaCreationDate/equanda-fixed
-.label.en Creation date
-.label.nl Creatie datum
-.label.fr Date de creation
-.key field.EquandaModificationDate/equanda-fixed
-.label.en Modification date
-.label.nl Datum laatste wijziging
-.label.fr Date du dernier modification
-.key field.EquandaVersion/equanda-fixed
-.label.en Record version
-.label.nl Record versie
-.label.fr Version des infos
-.key field.EquandaStatus/equanda-fixed
-.label.en Record status
-.label.nl Record status
-.label.fr Status des infos
-.key SelectViewHeader/equanda-fixed
-.label.en _
-.label.nl _
-.label.fr _
-.key SelectListHeader/equanda-fixed
-.label.en _
-.label.nl _
-.label.fr _
-.key SelectOneHeader/equanda-fixed
-.label.en _
-.label.nl _
-.label.fr _
-.key toEdit/equanda-fixed
-.label.en edit
-.label.nl wijzigen
-.label.fr editer
-.key toDisplay/equanda-fixed
-.label.en display
-.label.nl bekijken
-.label.fr visualizer
Copied: tags/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt (from rev 1159, branches/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt)
===================================================================
--- tags/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt (rev 0)
+++ tags/0.9.4.1/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt 2009-12-02 21:12:04 UTC (rev 1183)
@@ -0,0 +1,1000 @@
+;Last edited: 2007-06-03
+.languages en;nl;ro;fr
+.key 90000/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 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 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 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 90004/equanda-exceptions
+.label.en Cannot initialize bean
+.label.nl Kan bean niet initializeren
+.label.ro Bean-ul nu se poate initializa
+.label.fr Initialisation du bean non reusit
+.key 91001/equanda-exceptions
+.label.en Could not test choice $1 for field $$2 using class $3
+.label.nl Kan waarde $1 niet verifieren voor veld $$2 met klasse $3
+.label.ro Nu se poate testa alegerea $1 pentru campul $$2 folosind clasa $3
+.label.fr Peut pas controler le valeur $1 pour champs $$2 avec classe $3
+.key 91002/equanda-exceptions
+.label.en Value $1 is not one of the choices for field $$2
+.label.nl Waarde $1 is niet 1 van de keuzes voor veld $$2
+.label.ro Valoare $1 nu este una dintre optiunii $$2
+.label.fr $1 n'est pas une des choix pour champ $$2
+.key 91003/equanda-exceptions
+.label.en Compare constraint $1 not satisfied for field $$2 by value $3
+.label.nl Vergelijkingsconstraint $1 niet voldoende voor veld $$2 door waarde $3
+.label.ro Constrangerea de comparare $1 nu a fost valida pentru campul $$2 prin valoare $3
+.label.fr Constraint de comparaison $1 pas satisfait pour champs $$2 au valeur $3
+.key 91004/equanda-exceptions
+.label.en Field $$1 Immutable when field $$2 is set
+.label.nl Veld $$1 onveranderbaar wanneer veld $$2 is ingevuld
+.label.ro Campul $$1 este imutabil atunci cand campul $$2 este setat
+.label.fr Champ $$1 inmutable quand champ $$2 est rempli
+.key 91005/equanda-exceptions
+.label.en Cannot add null to multiple field $$1
+.label.nl Kan geen null toevoegen aan veld $$1
+.label.ro Nu se poate adauga null la un camp multiplu $$1
+.label.fr Ne peut pas ajouter null au champ $$1
+.key 91006/equanda-exceptions
+.label.en $$1 is required
+.label.nl $$1 is verplicht
+.label.ro $$1 este necesar
+.label.fr $$1 est néccessaire
+.key 91007/equanda-exceptions
+.label.en $$1 is unique
+.label.nl $$1 is uniek
+.label.ro $$1 este unic
+.label.fr $$1 est unique
+.key 91008/equanda-exceptions
+.label.en Include-value for field $$1 has wrong type
+.label.nl Inclusief-waarde voor veld $$1 heeft verkeerde type
+.label.ro Include-value pentru campul $$1 are tipul gresit
+.label.fr Valeur-inclusive pour champ $$1 a un type incorrect
+.key 91009/equanda-exceptions
+.label.en Failed to create included value for field $$1
+.label.nl Aanmaken inbegrepen waarde voor veld $$1 mislukt
+.label.ro Eroare la crearea valorii included-value pentru campul $$1
+.label.fr Création valeur inclusive pour champ $$1 échoué
+.key 91010/equanda-exceptions
+.label.en Internal error on create included value
+.label.nl Interne fout bij aanmaak inbegrepen waarde
+.label.ro Eroare interna la crearea valorii
+.label.fr Erreur interne chez création valeur inclusive
+.key 91011/equanda-exceptions
+.label.en Constraint violation for field $$1
+.label.nl Constraint violation voor veld $$1
+.label.ro Incalcarea cnstrangerilor pt campul $$1
+.label.fr Constraint violation pour champ $$1
+.key 91012/equanda-exceptions
+.label.en Failed to update value
+.label.nl Updaten van waarde mislukt
+.label.ro Eroare la salvarea valorii modificate
+.label.fr Update de la valeur échoué
+.key 91013/equanda-exceptions
+.label.en downCast Failed- cannot downCast root
+.label.nl downCast mislukt - kan root niet downCasten
+.label.ro eroare la downCast- nu se poate face downCast la radacina
+.label.fr downCast échoué - downCast pas possible au root
+.key 91014/equanda-exceptions
+.label.en downCast selector error
+.label.nl downCast selector fout
+.label.ro downCast eroare la cautare
+.label.fr downCast selector faute
+.key 91015/equanda-exceptions
+.label.en downCast create error
+.label.nl downCast create fout
+.label.ro downCast eroare la creare
+.label.fr downCast creat faute
+.key 91017/equanda-exceptions
+.label.en Invalid table type $$1 for table $$2
+.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
+.label.ro Datele au fost deja modificate
+.label.fr Données sont déjà changées
+.key 93001/equanda-exceptions
+.label.en Operation is not allowed
+.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
+.label.ro Actiune
+.label.fr Action
+.key ActionsSection/equanda-fixed
+.label.en Actions
+.label.nl Acties
+.label.ro Sectiunea pt. Actiune
+.label.fr Actions
+.key Add/equanda-fixed
+.label.en Add
+.label.nl Toevoegen
+.label.ro Adauga
+.label.fr Ajouter
+.key Add-Continue/equanda-fixed
+.label.en Add (Continue)
+.label.nl Toevoegen (volgende)
+.label.ro Adauga (Continua)
+.label.fr Ajouter (encore)
+.key Add-Select/equanda-fixed
+.label.en Add (Select)
+.label.nl Toevoegen
+.label.ro Adauga (Selecteaza)
+.label.fr Ajouter
+.key Add-View/equanda-fixed
+.label.en Add (View)
+.label.nl Toevoegen
+.label.ro Adauga (Vizualizare)
+.label.fr Ajouter
+.key Back/equanda-fixed
+.label.en Back
+.label.nl Terug
+.label.ro Inapoi
+.label.fr Retour
+.key BackToEdit/equanda-fixed
+.label.en Back to edit
+.label.nl Terug naar wijzigen
+.label.ro Inapoi la editare
+.label.fr Retour vers editer
+.key BorderConfig/equanda-fixed
+.label.en Configure Border
+.label.nl Configureer Border
+.label.ro Configurare Border
+.label.fr Configurer Border
+.key CaseLower/equanda-fixed
+.label.en Lower
+.label.nl Kleine letters
+.label.ro Minuscule
+.label.fr Miniscules
+.key CaseMixed/equanda-fixed
+.label.en Mixed
+.label.nl Gemengd
+.label.ro Combinat
+.label.fr Mixed
+.key CaseUpper/equanda-fixed
+.label.en Upper
+.label.nl Hoofdletters
+.label.ro Majuscule
+.label.fr Majuscules
+.key Category/equanda-fixed
+.label.en Category
+.label.nl Categorie
+.label.ro Categorie
+.label.fr Categorie
+.key ChangePassword/LoginMenu
+.label.en Change password
+.label.nl Wijzig paswoord
+.label.ro Schimba parola
+.label.fr Changez mot de passe
+.key ChangePassword/equanda-fixed
+.label.en Change password
+.label.nl Change password
+.label.ro Schimba parola
+.label.fr Change password
+.key CheckAll/Alerts
+.label.en Check all
+.label.nl Alle
+.label.ro Selecteaza toate
+.label.fr Tous
+.key ClearAll/Alerts
+.label.en Clear all
+.label.nl Geen
+.label.ro Deselecteaza toate
+.label.fr Rien
+.key Clone/equanda-fixed
+.label.en Clone
+.label.nl Dupliceer
+.label.ro Cloneaza
+.label.fr Duplicer
+.key Clone-Save/equanda-fixed
+.label.en Clone (Save)
+.label.nl Kloon (opslaan)
+.label.ro Cloneaza (Salvare)
+.label.fr Clone (sauvegarder)
+.key Close/equanda-fixed
+.label.en Close
+.label.nl Sluiten
+.label.ro Inchide
+.label.fr Fermer
+.key CurrentUserNotInTable/equanda-fixed
+.label.en Logged in with temporary user (not in users table)
+.label.nl Ingelogd met voorlopige gebruiker (niet in gebruikerstabel)
+.label.ro Logare cu user temporar (nu este adaugat in baza de date)
+.label.fr Utilisateur active est temporaire (pas dans fichier d'utilisateurs)
+.key CustomQuery/equanda-fixed
+.label.en Custom query
+.label.ro Interogare configurabila
+.key Detail/equanda-fixed
+.label.en Detail
+.label.nl Detail
+.label.ro Detaili
+.label.fr Detail
+.key Edit/equanda-fixed
+.label.en Edit
+.label.nl Wijzigen
+.label.ro Editeaza
+.label.fr Editer
+.key EnterNewPassword/ChangePassword
+.label.en Enter new password
+.label.nl Nieuw paswoord ingeven
+.label.ro Introduceti noua parola
+.label.fr Introduisez nouveau mot de passe
+.key EnterNewPassword/equanda-fixed
+.label.en Enter new password
+.label.nl Enter new password
+.label.ro Introduceti noua parola
+.label.fr Enter new password
+.key Field/equanda-fixed
+.label.en Field
+.label.nl Veld
+.label.ro Camp
+.label.fr Champ
+.key FieldsSection/equanda-fixed
+.label.en Fields
+.label.nl Velden
+.label.ro Campuri
+.label.fr Champs
+.key Select/Alerts
+.label.en Select
+.label.nl Zoeken
+.label.ro Cauta
+.label.fr Trouver
+.key Select/equanda-fixed
+.label.en Select
+.label.nl Zoek
+.label.ro Cauta
+.label.fr Cherche
+.key AddSelected/equanda-fixed
+.label.en Add selected objects
+.label.nl Toevoegen geselecteerde objecten
+.label.fr Ajouter objects selectés
+.key Group/equanda-fixed
+.label.en Group
+.label.nl Groep
+.label.ro Grup
+.label.fr Groupe
+.key HideInactiveRecords/equanda-fixed
+.label.en Hide inactive records
+.label.ro Ascunde inregistrarile inactive
+.key Ignore/Alerts
+.label.en Ignore
+.label.nl Negeer
+.label.ro Ignora
+.label.fr Ignorer
+.key Index/equanda-fixed
+.label.en Index
+.label.nl Index
+.label.ro Index
+.label.fr Index
+.key Insert/equanda-fixed
+.label.en Insert
+.label.nl Invoegen
+.label.ro Insereaza
+.label.fr Inserer
+.key InvalidDate/equanda-fixed
+.label.en Invalid value for date
+.label.nl Ongeldige waarde voor datum
+.label.ro Valuare invalida pt data
+.label.fr Format non valide pour date
+.key InvalidDouble/equanda-fixed
+.label.en Invalid double value
+.label.nl Ongeldig decimaal getal
+.label.ro Valoare invalida pt numar zecimal
+.label.fr Valeur decimale non valide
+.key InvalidInteger/equanda-fixed
+.label.en Invalid integer value
+.label.nl Ongeldig getal
+.label.ro Valoare invalida pt numar intreg
+.label.fr Nombre non valide
+.key InvalidUserPassword/ChangePassword
+.label.en Invalid user/password
+.label.nl Ongeldige gebruiker/paswoord
+.label.ro User/parola invalide
+.label.fr Utilisateur/mot de pas non vallable
+.key InvalidUserPassword/equanda-fixed
+.label.en Invalid user/password
+.label.nl Invalid user/password
+.label.ro Utilizator/parola invalida
+.label.fr Invalid user/password
+.key IsRequired/equanda-fixed
+.label.en Value is required
+.label.nl Waarde is verplicht
+.label.ro Valuarea este necesara
+.label.fr Valeur obligatoire
+.key LinkedSelects/equanda-fixed
+.label.en Reverse links
+.label.nl Omgekeerde links
+.label.ro Link-uri inverse
+.label.fr Selections lié
+.key List/equanda-fixed
+.label.en List
+.label.nl Lijst
+.label.ro Lista
+.label.fr Liste
+.key Load/equanda-fixed
+.label.en Load
+.label.nl Laden
+.label.ro Incarca
+.label.fr Ouvrir
+.key Logout/LoginMenu
+.label.en Logout
+.label.nl Uitloggen
+.label.ro Logout
+.label.fr Logout
+.key Logout/equanda-fixed
+.label.en Logout
+.label.nl Logout
+.label.ro Logout
+.label.fr Logout
+.key MoreLinkedSelects/equanda-fixed
+.label.en More reverse links
+.label.nl Meer omgekeerde links
+.label.ro Alte linkuri inverse
+.label.fr Plus de sélections lié
+.key NoMessage/Alerts
+.label.en Alert with no message
+.label.nl Melding zonder boodschap
+.label.ro Alerta fara nici un mesaj
+.label.fr Alert sans message
+.key NoResults/equanda-fixed
+.label.en No results.
+.label.nl Geen resultaten.
+.label.ro Nu exista rezultate.
+.label.fr Pas de résultats.
+.key button.OK/equanda-fixed
+.label.en OK
+.label.nl OK
+.label.ro OK
+.label.fr OK
+.key OldPassword/ChangePassword
+.label.en Old password
+.label.nl Oud paswoord
+.label.ro Vechea parola
+.label.fr Vieux mot de passe
+.key OldPassword/equanda-fixed
+.label.en Old password
+.label.nl Old password
+.label.ro Parola veche
+.label.fr Old password
+.key OrderResultSizeDescription/equanda-fixed
+.label.en The maximum number of results per page
+.label.ro Numarul maxim de rezultate afisate per pagina
+.key OrderResultSizeLabel/equanda-fixed
+.label.en Results/page
+.label.ro Rezultate/pagina
+.key Page/equanda-fixed
+.label.en Page
+.label.nl Pagina
+.label.ro Pagina
+.label.fr Page
+.key Parameter/equanda-fixed
+.label.en Parameter
+.label.nl Parameter
+.label.ro Parametru
+.label.fr Paramétre
+.key PasswordsDontMatch/ChangePassword
+.label.en New and old passwords dont match
+.label.nl Nieuwe en oude paswoord komen niet overeen
+.label.ro Vechea si noua parola nu se potrivesc
+.label.fr Le nouveau en vieux mot de passe ne corresponde pas
+.key button.Print/equanda-fixed
+.label.en Print
+.label.nl Afdrukken
+.label.ro Tiparire
+.label.fr Imprimer
+.key PrintLandscape/equanda-fixed
+.label.en Print landscape
+.label.nl Afdrukken landscape
+.label.ro Tiparire orizontala
+.label.fr Imprimer landscape
+.key PrintPortrait/equanda-fixed
+.label.en Print portrait
+.label.nl Afdrukken portrait
+.label.ro Tiparire verticala
+.label.fr Imprimer portrait
+.key ReenterNewPassword/ChangePassword
+.label.en Reenter new password
+.label.nl Herhaal nieuw paswoord
+.label.ro Reintroduceti noua parola
+.label.fr Répétez nouveaumot de passe
+.key ReenterNewPassword/equanda-fixed
+.labe...
[truncated message content] |
|
From: <tri...@us...> - 2009-12-02 20:55:42
|
Revision: 1182
http://equanda.svn.sourceforge.net/equanda/?rev=1182&view=rev
Author: triathlon98
Date: 2009-12-02 20:55:27 +0000 (Wed, 02 Dec 2009)
Log Message:
-----------
prepare release
Modified Paths:
--------------
branches/0.9.4.1/equanda-client/pom.xml
branches/0.9.4.1/equanda-dm/pom.xml
branches/0.9.4.1/equanda-generate/pom.xml
branches/0.9.4.1/equanda-maven-plugin/pom.xml
branches/0.9.4.1/equanda-server/pom.xml
branches/0.9.4.1/equanda-t5gui/pom.xml
branches/0.9.4.1/equanda-t5navigation/pom.xml
branches/0.9.4.1/equanda-tapestry5/pom.xml
branches/0.9.4.1/equanda-test/pom.xml
branches/0.9.4.1/equanda-test/test-core/pom.xml
branches/0.9.4.1/equanda-test/test-ddltool/pom.xml
branches/0.9.4.1/equanda-test/test-gui-t5-test/pom.xml
branches/0.9.4.1/equanda-test/test-t5-ear/pom.xml
branches/0.9.4.1/equanda-test/test-t5-gui/pom.xml
branches/0.9.4.1/equanda-test/test-test/pom.xml
branches/0.9.4.1/equanda-tool/pom.xml
branches/0.9.4.1/equanda-util/pom.xml
branches/0.9.4.1/pom.xml
Modified: branches/0.9.4.1/equanda-client/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-client/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-client/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-client</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-client</name>
<dependencies>
<dependency>
Modified: branches/0.9.4.1/equanda-dm/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-dm/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-dm/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-dm</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-dm</name>
<dependencies>
<dependency>
Modified: branches/0.9.4.1/equanda-generate/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-generate/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-generate/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-generate</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-generate</name>
<build>
<resources>
Modified: branches/0.9.4.1/equanda-maven-plugin/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-maven-plugin/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-maven-plugin/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<artifactId>equanda</artifactId>
<groupId>org.equanda</groupId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-maven-plugin</name>
<description>
Provide the maven plugins for equanda users.
Modified: branches/0.9.4.1/equanda-server/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-server/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-server/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-server</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-server</name>
<dependencies>
<dependency>
Modified: branches/0.9.4.1/equanda-t5gui/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-t5gui/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-t5gui/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5gui</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-t5gui</name>
<build>
Modified: branches/0.9.4.1/equanda-t5navigation/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-t5navigation/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-t5navigation/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-t5navigation</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-t5navigation</name>
<build>
Modified: branches/0.9.4.1/equanda-tapestry5/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-tapestry5/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tapestry5</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-tapestry5</name>
<build>
Modified: branches/0.9.4.1/equanda-test/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-test/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-test/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,14 +2,14 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
<packaging>pom</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-test</name>
<description>tests for equanda</description>
Modified: branches/0.9.4.1/equanda-test/test-core/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-test/test-core/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-test/test-core/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-core</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>test-core</name>
<description>test core</description>
<build>
Modified: branches/0.9.4.1/equanda-test/test-ddltool/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-test/test-ddltool/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-test/test-ddltool/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-ddltool</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>test-ddltool</name>
<description>test ddltool</description>
Modified: branches/0.9.4.1/equanda-test/test-gui-t5-test/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-test/test-gui-t5-test/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-test/test-gui-t5-test/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-gui-t5-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>test-gui-t5-test</name>
<description>test test</description>
Modified: branches/0.9.4.1/equanda-test/test-t5-ear/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-test/test-t5-ear/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-test/test-t5-ear/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-ear</artifactId>
<packaging>ear</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>test-t5-ear</name>
<description>test ear</description>
<build>
Modified: branches/0.9.4.1/equanda-test/test-t5-gui/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-test/test-t5-gui/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-test/test-t5-gui/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-t5-gui</artifactId>
<packaging>war</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>test-t5-gui</name>
<description>test gui</description>
<build>
Modified: branches/0.9.4.1/equanda-test/test-test/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-test/test-test/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-test/test-test/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda-test</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda.test</groupId>
<artifactId>test-test</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>test-test</name>
<description>test test</description>
Modified: branches/0.9.4.1/equanda-tool/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-tool/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-tool/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-tool</name>
<dependencies>
<dependency>
Modified: branches/0.9.4.1/equanda-util/pom.xml
===================================================================
--- branches/0.9.4.1/equanda-util/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/equanda-util/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -2,13 +2,13 @@
<parent>
<groupId>org.equanda</groupId>
<artifactId>equanda</artifactId>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.equanda</groupId>
<artifactId>equanda-util</artifactId>
<packaging>jar</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda-util</name>
<dependencies>
<dependency>
Modified: branches/0.9.4.1/pom.xml
===================================================================
--- branches/0.9.4.1/pom.xml 2009-11-15 19:33:47 UTC (rev 1181)
+++ branches/0.9.4.1/pom.xml 2009-12-02 20:55:27 UTC (rev 1182)
@@ -4,7 +4,7 @@
<artifactId>equanda</artifactId>
<packaging>pom</packaging>
- <version>0.9.4.1-SNAPSHOT</version>
+ <version>0.9.4.1</version>
<name>equanda</name>
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-11-15 19:33:57
|
Revision: 1181
http://equanda.svn.sourceforge.net/equanda/?rev=1181&view=rev
Author: triathlon98
Date: 2009-11-15 19:33:47 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
EQ-352 slider should treat decimal seperator better
Modified Paths:
--------------
branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java
branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js
Modified: branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java 2009-11-15 19:33:14 UTC (rev 1180)
+++ branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java 2009-11-15 19:33:47 UTC (rev 1181)
@@ -24,11 +24,22 @@
package org.equanda.tapestry5.components;
-import org.apache.tapestry5.*;
-import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
+import org.apache.tapestry5.annotations.IncludeStylesheet;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.PersistentLocale;
import org.apache.tapestry5.services.Request;
+import java.text.DecimalFormatSymbols;
import java.util.Locale;
/**
@@ -98,13 +109,12 @@
void afterRender( MarkupWriter writer )
{
- String jsCommand =
- "new Control.eqSlider('handle_%s','track_%s','%s',{sliderValue:" + getNumberPattern( value ) + ",range:" +
- "$R(" + getNumberPattern( min ) + "," + getNumberPattern( max ) + "),increment:" +
- getNumberPattern( inc );
- jsCommand = String
- .format( Locale.US, jsCommand, getClientId(), getClientId(), formValue.getClientId(), value, min, max,
- inc );
+ String jsCommand = "new Control.eqSlider('handle_%s','track_%s','%s',{sliderValue:" +
+ getNumberPattern( value ) + ",range:" + "$R(" + getNumberPattern( min ) + "," +
+ getNumberPattern( max ) + "),increment:" + getNumberPattern( inc ) +
+ ",decimalSep:'%s'";
+ jsCommand = String.format( Locale.US, jsCommand,
+ getClientId(), getClientId(), formValue.getClientId(), value, min, max, inc, getDecimalSep() );
if ( disabled )
{
@@ -124,6 +134,14 @@
this.value = value;
}
+ private String getDecimalSep()
+ {
+ Locale locale = resources.getLocale();
+ if ( null == locale ) return ".";
+ DecimalFormatSymbols dfs = new DecimalFormatSymbols( locale );
+ return Character.toString( dfs.getDecimalSeparator() );
+ }
+
private String getNumberPattern( Number value )
{
String numberPattern = "%d";
Modified: branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js 2009-11-15 19:33:14 UTC (rev 1180)
+++ branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js 2009-11-15 19:33:47 UTC (rev 1181)
@@ -26,10 +26,11 @@
this.input = $(input);
this.options = options || { };
- this.axis = this.options.axis || 'horizontal';
- this.increment = this.options.increment || 1;
- this.step = parseInt(this.options.step || '1');
- this.range = this.options.range || $R(0,1);
+ this.axis = this.options.axis || 'horizontal';
+ this.increment = this.options.increment || 1;
+ this.step = parseInt(this.options.step || '1');
+ this.range = this.options.range || $R(0,1);
+ this.decimalSep = this.options.decimalSep || '.';
this.trackLength = parseInt(this.options.trackLength || '200');
this.handleLength = parseInt(this.options.handleLength || '5');
@@ -53,7 +54,7 @@
this.track.style.height=""+this.trackLength+"px";
this.handles[0].style.height=""+this.handleLength+"px";
} else {
- this.track.style.width=""+this.trackLength+"px"
+ this.track.style.width=""+this.trackLength+"px";
this.handles[0].style.width=""+this.handleLength+"px";
}
@@ -131,8 +132,11 @@
valueTyped: function(event){
if ( Tapestry.decimalFormatSymbols )
this.setValue( parseFloat( Tapestry.formatLocalizedNumber( event.target.value, false ) ) );
- else
- this.setValue( parseFloat( event.target.value, false ) );
+ else {
+ var val = event.target.valueOf;
+ val = val.replace( this.decimalSep,'.' );
+ this.setValue( parseFloat( val, false ) );
+ }
},
setValue: function(sliderValue, handleIdx){
if (!this.active) {
@@ -254,7 +258,11 @@
this.event = event;
this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
this.input.value = this.values.length>1 ? this.values : this.value, this;
- if ( Tapestry.decimalFormatSymbols ) this.input.value = this.input.value.replace( /\./g, Tapestry.decimalFormatSymbols.decimalSeparator );
+ if ( Tapestry.decimalFormatSymbols ) {
+ this.input.value = this.input.value.replace( '.', Tapestry.decimalFormatSymbols.decimalSeparator );
+ } else {
+ this.input.value = this.input.value.replace( '.', this.decimalSep );
+ }
if (this.initialized && this.options.onSlide)
this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
},
@@ -273,7 +281,11 @@
},
updateFinished: function() {
this.input.value = this.values.length>1 ? this.values : this.value, this;
- if ( Tapestry.decimalFormatSymbols ) this.input.value = this.input.value.replace( /\./g, Tapestry.decimalFormatSymbols.decimalSeparator );
+ if ( Tapestry.decimalFormatSymbols ) {
+ this.input.value = this.input.value.replace( '.', Tapestry.decimalFormatSymbols.decimalSeparator );
+ } else {
+ this.input.value = this.input.value.replace( '.', this.decimalSep );
+ }
if (this.initialized && this.options.onSlide)
this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
if (this.initialized && this.options.onChange)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-11-15 19:33:24
|
Revision: 1180
http://equanda.svn.sourceforge.net/equanda/?rev=1180&view=rev
Author: triathlon98
Date: 2009-11-15 19:33:14 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
EQ-352 slider should treat decimal seperator better
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java 2009-11-15 14:42:25 UTC (rev 1179)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java 2009-11-15 19:33:14 UTC (rev 1180)
@@ -36,7 +36,6 @@
import org.apache.tapestry5.annotations.Parameter;
import org.apache.tapestry5.annotations.SupportsInformalParameters;
import org.apache.tapestry5.ioc.annotations.Inject;
-import org.apache.tapestry5.services.PersistentLocale;
import org.apache.tapestry5.services.Request;
import java.text.DecimalFormatSymbols;
@@ -79,9 +78,6 @@
@Parameter( value = "1", required = false )
private Number inc;
- @Inject
- private PersistentLocale persistentLocale;
-
/**
* If true, then the field will render out with a disabled attribute (to turn off client-side behavior).
* Further, a disabled field ignores any value in the request when the form is submitted.
@@ -140,9 +136,9 @@
private String getDecimalSep()
{
- Locale locale = persistentLocale.get();
+ Locale locale = resources.getLocale();
if ( null == locale ) return ".";
- DecimalFormatSymbols dfs = new DecimalFormatSymbols( persistentLocale.get() );
+ DecimalFormatSymbols dfs = new DecimalFormatSymbols( locale );
return Character.toString( dfs.getDecimalSeparator() );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-11-15 14:42:31
|
Revision: 1179
http://equanda.svn.sourceforge.net/equanda/?rev=1179&view=rev
Author: triathlon98
Date: 2009-11-15 14:42:25 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
EQ-352 resurrect slider demo in example
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 2009-11-15 14:41:22 UTC (rev 1178)
+++ t5-equanda-example/pom.xml 2009-11-15 14:42:25 UTC (rev 1179)
@@ -174,7 +174,7 @@
<properties>
<equanda-release-version>0.9.5-SNAPSHOT</equanda-release-version>
- <tapestry-release-version>5.1.0.3</tapestry-release-version>
+ <tapestry-release-version>5.1.0.5</tapestry-release-version>
<chenillekit-version>1.0.0</chenillekit-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 2009-11-15 14:41:22 UTC (rev 1178)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2009-11-15 14:42:25 UTC (rev 1179)
@@ -140,8 +140,23 @@
<blockquote><span t:type="equanda/TextAreaAutoExpander"/></blockquote> somewhere in your page
(or layout component).</p>
</t:parameter>
- <t:parameter name="title8">DeltaBar</t:parameter>
+ <t:parameter name="title8">Slider</t:parameter>
<t:parameter name="content8">
+ <p>The Slider component allows selecting a numeric value</p>
+
+ <p>A value between one and hundred with precision of one.<br /> <span t:type="equanda/Slider" value="slider1" min="1" max="100" inc="1"/></p>
+ <span t:type="equanda/Slider" value="slider1" min="1" max="100" inc="1" disabled="literal:false"/>
+ <p>A value between zero and one with precision of .5.<br /> <span t:type="equanda/Slider" value="slider2" min="0" max="1" inc=".05"/></p>
+ <span t:type="equanda/Slider" value="slider2" min="0" max="1" inc=".05" disabled="literal:false"/>
+ <p>A disabled slider.<br /> <span t:type="equanda/Slider" value="slider3" min="1" max="100" inc="1" disabled="literal:true"/></p>
+ <span t:type="equanda/Slider" value="slider3" min="1" max="100" inc="1" disabled="literal:true"/>
+ <p>A value between one and hundred, incrementing by 10.<br /> <span t:type="equanda/Slider" value="slider4" min="1" max="100" inc="10"/></p>
+ <span t:type="equanda/Slider" value="slider4" min="1" max="100" inc="10" disabled="literal:false"/>
+ <p>A value between zero and five with precision of .1.<br /> <span t:type="equanda/Slider" value="slider5" min="0" max="5" inc=".1"/></p>
+ <span t:type="equanda/Slider" value="slider5" min="0" max="5" inc=".1" disabled="literal:false"/>
+ </t:parameter>
+ <t:parameter name="title9">DeltaBar</t:parameter>
+ <t:parameter name="content9">
<p>The DeltaBar component allow display a simple horizontal bar with from and to values.</p>
<t:equanda.DeltaBar fromPercentage="literal:27" toPercentage="literal:82" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-11-15 14:41:30
|
Revision: 1178
http://equanda.svn.sourceforge.net/equanda/?rev=1178&view=rev
Author: triathlon98
Date: 2009-11-15 14:41:22 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
EQ-352 slider should treat decimal seperator better
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java 2009-11-01 11:58:26 UTC (rev 1177)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Slider.java 2009-11-15 14:41:22 UTC (rev 1178)
@@ -24,11 +24,22 @@
package org.equanda.tapestry5.components;
-import org.apache.tapestry5.*;
-import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
+import org.apache.tapestry5.annotations.IncludeStylesheet;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.PersistentLocale;
import org.apache.tapestry5.services.Request;
+import java.text.DecimalFormatSymbols;
import java.util.Locale;
/**
@@ -68,6 +79,9 @@
@Parameter( value = "1", required = false )
private Number inc;
+ @Inject
+ private PersistentLocale persistentLocale;
+
/**
* If true, then the field will render out with a disabled attribute (to turn off client-side behavior).
* Further, a disabled field ignores any value in the request when the form is submitted.
@@ -99,13 +113,12 @@
void afterRender( MarkupWriter writer )
{
- String jsCommand =
- "new Control.eqSlider('handle_%s','track_%s','%s',{sliderValue:" + getNumberPattern( value ) + ",range:" +
- "$R(" + getNumberPattern( min ) + "," + getNumberPattern( max ) + "),increment:" +
- getNumberPattern( inc );
- jsCommand = String
- .format( Locale.US, jsCommand, getClientId(), getClientId(), formValue.getClientId(), value, min, max,
- inc );
+ String jsCommand = "new Control.eqSlider('handle_%s','track_%s','%s',{sliderValue:" +
+ getNumberPattern( value ) + ",range:" + "$R(" + getNumberPattern( min ) + "," +
+ getNumberPattern( max ) + "),increment:" + getNumberPattern( inc ) +
+ ",decimalSep:'%s'";
+ jsCommand = String.format( Locale.US, jsCommand,
+ getClientId(), getClientId(), formValue.getClientId(), value, min, max, inc, getDecimalSep() );
if ( disabled )
{
@@ -125,6 +138,14 @@
this.value = value;
}
+ private String getDecimalSep()
+ {
+ Locale locale = persistentLocale.get();
+ if ( null == locale ) return ".";
+ DecimalFormatSymbols dfs = new DecimalFormatSymbols( persistentLocale.get() );
+ return Character.toString( dfs.getDecimalSeparator() );
+ }
+
private String getNumberPattern( Number value )
{
String numberPattern = "%d";
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js 2009-11-01 11:58:26 UTC (rev 1177)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/resources/slider.js 2009-11-15 14:41:22 UTC (rev 1178)
@@ -26,10 +26,11 @@
this.input = $(input);
this.options = options || { };
- this.axis = this.options.axis || 'horizontal';
- this.increment = this.options.increment || 1;
- this.step = parseInt(this.options.step || '1');
- this.range = this.options.range || $R(0,1);
+ this.axis = this.options.axis || 'horizontal';
+ this.increment = this.options.increment || 1;
+ this.step = parseInt(this.options.step || '1');
+ this.range = this.options.range || $R(0,1);
+ this.decimalSep = this.options.decimalSep || '.';
this.trackLength = parseInt(this.options.trackLength || '200');
this.handleLength = parseInt(this.options.handleLength || '5');
@@ -53,7 +54,7 @@
this.track.style.height=""+this.trackLength+"px";
this.handles[0].style.height=""+this.handleLength+"px";
} else {
- this.track.style.width=""+this.trackLength+"px"
+ this.track.style.width=""+this.trackLength+"px";
this.handles[0].style.width=""+this.handleLength+"px";
}
@@ -131,8 +132,11 @@
valueTyped: function(event){
if ( Tapestry.decimalFormatSymbols )
this.setValue( parseFloat( Tapestry.formatLocalizedNumber( event.target.value, false ) ) );
- else
- this.setValue( parseFloat( event.target.value, false ) );
+ else {
+ var val = event.target.valueOf;
+ val = val.replace( this.decimalSep,'.' );
+ this.setValue( parseFloat( val, false ) );
+ }
},
setValue: function(sliderValue, handleIdx){
if (!this.active) {
@@ -254,7 +258,11 @@
this.event = event;
this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
this.input.value = this.values.length>1 ? this.values : this.value, this;
- if ( Tapestry.decimalFormatSymbols ) this.input.value = this.input.value.replace( /\./g, Tapestry.decimalFormatSymbols.decimalSeparator );
+ if ( Tapestry.decimalFormatSymbols ) {
+ this.input.value = this.input.value.replace( '.', Tapestry.decimalFormatSymbols.decimalSeparator );
+ } else {
+ this.input.value = this.input.value.replace( '.', this.decimalSep );
+ }
if (this.initialized && this.options.onSlide)
this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
},
@@ -273,7 +281,11 @@
},
updateFinished: function() {
this.input.value = this.values.length>1 ? this.values : this.value, this;
- if ( Tapestry.decimalFormatSymbols ) this.input.value = this.input.value.replace( /\./g, Tapestry.decimalFormatSymbols.decimalSeparator );
+ if ( Tapestry.decimalFormatSymbols ) {
+ this.input.value = this.input.value.replace( '.', Tapestry.decimalFormatSymbols.decimalSeparator );
+ } else {
+ this.input.value = this.input.value.replace( '.', this.decimalSep );
+ }
if (this.initialized && this.options.onSlide)
this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
if (this.initialized && this.options.onChange)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-11-01 11:58:32
|
Revision: 1177
http://equanda.svn.sourceforge.net/equanda/?rev=1177&view=rev
Author: triathlon98
Date: 2009-11-01 11:58:26 +0000 (Sun, 01 Nov 2009)
Log Message:
-----------
remove redundant character
Modified Paths:
--------------
branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm
Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm 2009-11-01 11:53:58 UTC (rev 1176)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm 2009-11-01 11:58:26 UTC (rev 1177)
@@ -4,5 +4,5 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
<t:if test="equanda-readable:table.${field.LinkTableName}">
-${dollar}{value}.${field.VarName}}
+${dollar}{value}.${field.VarName}
</t:if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-11-01 11:54:05
|
Revision: 1176
http://equanda.svn.sourceforge.net/equanda/?rev=1176&view=rev
Author: triathlon98
Date: 2009-11-01 11:53:58 +0000 (Sun, 01 Nov 2009)
Log Message:
-----------
remove accolade
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm 2009-10-21 09:57:37 UTC (rev 1175)
+++ trunk/equanda-generate/src/main/velocity/t5gui/summary-tml/linkone-short.tml.vm 2009-11-01 11:53:58 UTC (rev 1176)
@@ -4,5 +4,5 @@
#* @vtlvariable name="table" type="org.equanda.domain.xml.transform.RootTable" *#
#* @vtlvariable name="field" type="org.equanda.domain.xml.Field" *#
<t:if test="equanda-readable:table.${field.LinkTableName}">
-${dollar}{value}.${field.VarName}}
+${dollar}{value}.${field.VarName}
</t:if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-21 09:57:51
|
Revision: 1175
http://equanda.svn.sourceforge.net/equanda/?rev=1175&view=rev
Author: triathlon98
Date: 2009-10-21 09:57:37 +0000 (Wed, 21 Oct 2009)
Log Message:
-----------
EQ-364 change layout to be usable inside a table in IE
Modified Paths:
--------------
branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
Modified: branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-10-21 09:31:56 UTC (rev 1174)
+++ branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-10-21 09:57:37 UTC (rev 1175)
@@ -77,11 +77,18 @@
public int getToWidth()
{
- return (int)Math.round( width / 100.0 * toPercentage );
+ int res = (int)Math.round( width / 100.0 * toPercentage ) - getFromWidth();
+ return res > 0 ? res : 0;
}
+ public int getRemainderWidth()
+ {
+ int res = width - getToWidth() - getFromWidth();
+ return res > 0 ? res : 0;
+ }
+
public int getTotalWidth()
{
- return width;
- }
+ return width + 60;
+ }
}
Modified: branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-10-21 09:31:56 UTC (rev 1174)
+++ branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-10-21 09:57:37 UTC (rev 1175)
@@ -1,42 +1,27 @@
-<div style="position: relative; /* IE is dumb */
-width: ${totalWidth}px;
+<div style="width: ${totalWidth}px;
border: 1px solid ${borderColour};
background: ${backgroundColour};
padding: 2px; ">
- <div style="width: ${totalWidth}px;
-position: absolute;
-background: ${remainderColour};
-padding: 0;
-height: 1em;
-line-height: 1em; "></div>
- <div style="width: ${toWidth}px;
-position: absolute;
-background: ${toColour};
-padding: 0;
-height: 1em;
-line-height: 1em; "></div>
- <div style="width: ${fromWidth}px;
-position: absolute;
+ <strong style="width: 30px;
+display: inline-block;
+text-align: center;
+color: ${textColour};
+height: 1em; ">${fromPercentage}<span style="font-size:60%;">%</span></strong>
+ <span style="width: ${fromWidth}px;
+display: inline-block;
background: ${fromColour};
-padding: 0;
-height: 1em;
-line-height: 1em; "></div>
- <strong style="width: ${width}px;
-display: block;
-position: absolute;
-background: transparent;
-text-align: right;
+height: 1em; "></span>
+ <span style="width: ${toWidth}px;
+display: inline-block;
+background: ${toColour};
+height: 1em; "></span>
+ <span style="width: ${remainderWidth}px;
+display: inline-block;
+background: ${remainderColour};
+height: 1em; "></span>
+ <strong style="width: 30px;
+display: inline-block;
+text-align: center;
color: ${textColour};
-padding: 0 3px;
-height: 1em;
-line-height: 1em; ">${toPercentage}%</strong>
- <strong style="width: ${width}px;
-display: block;
-position: relative;
-background: transparent;
-text-align: left;
-color: ${textColour};
-padding: 0 3px;
-height: 1em;
-line-height: 1em; ">${fromPercentage}%</strong>
-</div>
\ No newline at end of file
+height: 1em; ">${toPercentage}<span style="font-size:60%;">%</span></strong>
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-21 09:32:03
|
Revision: 1174
http://equanda.svn.sourceforge.net/equanda/?rev=1174&view=rev
Author: triathlon98
Date: 2009-10-21 09:31:56 +0000 (Wed, 21 Oct 2009)
Log Message:
-----------
EQ-364 change layout to be usable inside a table in IE
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-10-06 14:54:08 UTC (rev 1173)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-10-21 09:31:56 UTC (rev 1174)
@@ -77,11 +77,18 @@
public int getToWidth()
{
- return (int)Math.round( width / 100.0 * toPercentage );
+ int res = (int)Math.round( width / 100.0 * toPercentage ) - getFromWidth();
+ return res > 0 ? res : 0;
}
+ public int getRemainderWidth()
+ {
+ int res = width - getToWidth() - getFromWidth();
+ return res > 0 ? res : 0;
+ }
+
public int getTotalWidth()
{
- return width;
+ return width + 60;
}
}
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-10-06 14:54:08 UTC (rev 1173)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-10-21 09:31:56 UTC (rev 1174)
@@ -1,42 +1,27 @@
-<div style="position: relative; /* IE is dumb */
-width: ${totalWidth}px;
+<div style="width: ${totalWidth}px;
border: 1px solid ${borderColour};
background: ${backgroundColour};
padding: 2px; ">
- <div style="width: ${totalWidth}px;
-position: absolute;
-background: ${remainderColour};
-padding: 0;
-height: 1em;
-line-height: 1em; "></div>
- <div style="width: ${toWidth}px;
-position: absolute;
-background: ${toColour};
-padding: 0;
-height: 1em;
-line-height: 1em; "></div>
- <div style="width: ${fromWidth}px;
-position: absolute;
+ <strong style="width: 30px;
+display: inline-block;
+text-align: center;
+color: ${textColour};
+height: 1em; ">${fromPercentage}<span style="font-size:60%;">%</span></strong>
+ <span style="width: ${fromWidth}px;
+display: inline-block;
background: ${fromColour};
-padding: 0;
-height: 1em;
-line-height: 1em; "></div>
- <strong style="width: ${width}px;
-display: block;
-position: absolute;
-background: transparent;
-text-align: right;
+height: 1em; "></span>
+ <span style="width: ${toWidth}px;
+display: inline-block;
+background: ${toColour};
+height: 1em; "></span>
+ <span style="width: ${remainderWidth}px;
+display: inline-block;
+background: ${remainderColour};
+height: 1em; "></span>
+ <strong style="width: 30px;
+display: inline-block;
+text-align: center;
color: ${textColour};
-padding: 0 3px;
-height: 1em;
-line-height: 1em; ">${toPercentage}%</strong>
- <strong style="width: ${width}px;
-display: block;
-position: relative;
-background: transparent;
-text-align: left;
-color: ${textColour};
-padding: 0 3px;
-height: 1em;
-line-height: 1em; ">${fromPercentage}%</strong>
-</div>
\ No newline at end of file
+height: 1em; ">${toPercentage}<span style="font-size:60%;">%</span></strong>
+</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-06 14:54:15
|
Revision: 1173
http://equanda.svn.sourceforge.net/equanda/?rev=1173&view=rev
Author: triathlon98
Date: 2009-10-06 14:54:08 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
EQ-364 add remainderColour parameter
Modified Paths:
--------------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki
Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-10-06 14:47:55 UTC (rev 1172)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-10-06 14:54:08 UTC (rev 1173)
@@ -55,6 +55,10 @@
private String backgroundColour;
@Property
+ @Parameter( value = "transparent", required = false, defaultPrefix = "literal" )
+ private String remainderColour;
+
+ @Property
@Parameter( value = "red", required = false, defaultPrefix = "literal" )
private String fromColour;
Modified: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-10-06 14:47:55 UTC (rev 1172)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-10-06 14:54:08 UTC (rev 1173)
@@ -3,22 +3,24 @@
border: 1px solid ${borderColour};
background: ${backgroundColour};
padding: 2px; ">
- <strong style="width: ${toWidth}px;
-display: block;
+ <div style="width: ${totalWidth}px;
position: absolute;
+background: ${remainderColour};
+padding: 0;
+height: 1em;
+line-height: 1em; "></div>
+ <div style="width: ${toWidth}px;
+position: absolute;
background: ${toColour};
-text-align: right;
padding: 0;
height: 1em;
-line-height: 1em; "></strong>
- <strong style="width: ${fromWidth}px;
-display: block;
+line-height: 1em; "></div>
+ <div style="width: ${fromWidth}px;
position: absolute;
background: ${fromColour};
-text-align: left;
padding: 0;
height: 1em;
-line-height: 1em; "></strong>
+line-height: 1em; "></div>
<strong style="width: ${width}px;
display: block;
position: absolute;
Modified: trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki 2009-10-06 14:47:55 UTC (rev 1172)
+++ trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki 2009-10-06 14:54:08 UTC (rev 1173)
@@ -10,7 +10,8 @@
- backgroundColour : background colour for the component, defaults to "transparent".
- fromColour : colour for the "from" bar, defaults to "red".
- toColour : colour for the "to" bar, defaults to "lightgreen".
-- toColour : colour for the percentage indications, defaults to "black".
+- remainderColour : background colour for rest of the bar, right of the "to", defaults to "transparent".
+- textColour : colour for the percentage indications, defaults to "black".
<code>
<t:equanda.DeltaBar fromPercentage="literal:8" toPercentage="literal:100" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-06 14:48:04
|
Revision: 1172
http://equanda.svn.sourceforge.net/equanda/?rev=1172&view=rev
Author: triathlon98
Date: 2009-10-06 14:47:55 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
EQ-364 add remainderColour parameter
Modified Paths:
--------------
branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
branches/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki
Modified: branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-10-06 13:42:15 UTC (rev 1171)
+++ branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-10-06 14:47:55 UTC (rev 1172)
@@ -55,6 +55,10 @@
private String backgroundColour;
@Property
+ @Parameter( value = "transparent", required = false, defaultPrefix = "literal" )
+ private String remainderColour;
+
+ @Property
@Parameter( value = "red", required = false, defaultPrefix = "literal" )
private String fromColour;
Modified: branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-10-06 13:42:15 UTC (rev 1171)
+++ branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-10-06 14:47:55 UTC (rev 1172)
@@ -3,22 +3,24 @@
border: 1px solid ${borderColour};
background: ${backgroundColour};
padding: 2px; ">
- <strong style="width: ${toWidth}px;
-display: block;
+ <div style="width: ${totalWidth}px;
position: absolute;
+background: ${remainderColour};
+padding: 0;
+height: 1em;
+line-height: 1em; "></div>
+ <div style="width: ${toWidth}px;
+position: absolute;
background: ${toColour};
-text-align: right;
padding: 0;
height: 1em;
-line-height: 1em; "></strong>
- <strong style="width: ${fromWidth}px;
-display: block;
+line-height: 1em; "></div>
+ <div style="width: ${fromWidth}px;
position: absolute;
background: ${fromColour};
-text-align: left;
padding: 0;
height: 1em;
-line-height: 1em; "></strong>
+line-height: 1em; "></div>
<strong style="width: ${width}px;
display: block;
position: absolute;
Modified: branches/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki 2009-10-06 13:42:15 UTC (rev 1171)
+++ branches/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki 2009-10-06 14:47:55 UTC (rev 1172)
@@ -10,7 +10,8 @@
- backgroundColour : background colour for the component, defaults to "transparent".
- fromColour : colour for the "from" bar, defaults to "red".
- toColour : colour for the "to" bar, defaults to "lightgreen".
-- toColour : colour for the percentage indications, defaults to "black".
+- remainderColour : background colour for rest of the bar, right of the "to", defaults to "transparent".
+- textColour : colour for the percentage indications, defaults to "black".
<code>
<t:equanda.DeltaBar fromPercentage="literal:8" toPercentage="literal:100" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-06 13:42:23
|
Revision: 1171
http://equanda.svn.sourceforge.net/equanda/?rev=1171&view=rev
Author: triathlon98
Date: 2009-10-06 13:42:15 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
complete doc ref
Modified Paths:
--------------
trunk/equanda-tapestry5/src/site/wiki/index.wiki
Modified: trunk/equanda-tapestry5/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/index.wiki 2009-10-06 11:17:26 UTC (rev 1170)
+++ trunk/equanda-tapestry5/src/site/wiki/index.wiki 2009-10-06 13:42:15 UTC (rev 1171)
@@ -6,7 +6,8 @@
There is a [online sample application|http://app.spoon-it.be/t5example/] demonstrating these components, the subversion repository is [browsable here|http://equanda.svn.sourceforge.net/viewvc/equanda/t5-equanda-example/].
The following components are provided
-- [Accordion|accordion.html]
+- [Accordion|accordion.html]
+- [DeltaBar|deltabar.html]
- [FormActionLink|formactionlink.html]
- [FormSupport|formsupport.html]
- [FormTraversal|formtraversal.html]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-06 11:17:36
|
Revision: 1170
http://equanda.svn.sourceforge.net/equanda/?rev=1170&view=rev
Author: triathlon98
Date: 2009-10-06 11:17:26 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
public not needed on interfaces
Modified Paths:
--------------
trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java
Modified: trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java
===================================================================
--- trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java 2009-10-06 11:16:34 UTC (rev 1169)
+++ trunk/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java 2009-10-06 11:17:26 UTC (rev 1170)
@@ -38,9 +38,9 @@
public interface NavigationContext
extends Serializable
{
- public String getId();
+ String getId();
- public boolean isValid();
+ boolean isValid();
/**
* invalidates the current NavigationContext
@@ -48,7 +48,7 @@
*
* @return redirect target to return to
*/
- public Object invalidate();
+ Object invalidate();
/**
* Adds a persistentField from a page to the NavigationContext
@@ -56,14 +56,14 @@
* @param pageName page name
* @param persistentField persistence info
*/
- public void addPersistentField( String pageName, PersistentFieldChange persistentField );
+ void addPersistentField( String pageName, PersistentFieldChange persistentField );
/**
* Remove all fields for a page.
*
* @param pageName the name of the page
*/
- public void removeAllFields( String pageName );
+ void removeAllFields( String pageName );
/**
* Return a Collection containing all persistent fields of a page
@@ -71,14 +71,14 @@
* @param pageName page name
* @return persistence info
*/
- public Collection<PersistentFieldChange> getPersistentFields( String pageName );
+ Collection<PersistentFieldChange> getPersistentFields( String pageName );
/**
* Get the id of the navigation which was active when this one was created
*
* @return previously active navigation id
*/
- public String getPreviousId();
+ String getPreviousId();
/**
* Get the redirect target user should return to when this navigation mini-conversation ends.
@@ -100,5 +100,4 @@
* @return array with the last few return targets
*/
NavigationTarget[] getRecentReturnTargets();
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-06 11:16:47
|
Revision: 1169
http://equanda.svn.sourceforge.net/equanda/?rev=1169&view=rev
Author: triathlon98
Date: 2009-10-06 11:16:34 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
EQ-365, EQ-366 fixes for delete
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.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 2009-10-06 08:15:23 UTC (rev 1168)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-10-06 11:16:34 UTC (rev 1169)
@@ -6,20 +6,22 @@
<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
- <div class="eqInlR" t:id="inlPagedLoop" t:type="equanda/JSPagedLoop" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
+ <div t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
<t:if test="isCanAdd()">
<t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
</t:if>
</t:parameter>
- <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>
+ <div class="eqInlR">
+ <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>
+ </div>
+ <div class="eqInlRD er-${dollar}{clientId}-${dollar}{index}">
+ <t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" setterIndexStart="clientId" setterIndexEnd="prop:index" editmode="true" canSwitch="false"/></t:if>
+ </div>
</div>
- <div class="eqInlRD er-${dollar}{clientId}-${dollar}{index}">
- <t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" setterIndexStart="clientId" setterIndexEnd="prop:index" editmode="true" canSwitch="false"/></t:if>
- </div>
</div>
</div>
\ No newline at end of file
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2009-10-06 08:15:23 UTC (rev 1168)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2009-10-06 11:16:34 UTC (rev 1169)
@@ -36,6 +36,7 @@
import ${ejbPackage}.client.${table.Name};
import org.equanda.t5gui.SelectedSettings;
import org.equanda.t5gui.SelectedSettingsForSelect;
+import org.equanda.t5gui.services.EquandaSetterCache;
import org.equanda.t5nav.services.NavigationManager;
import ${package}.pages.${table.Name}EquandaAll;
import ${package}.pages.${table.Name}Edit;
@@ -79,6 +80,9 @@
@Inject
private NavigationManager navigationManager;
+ @Inject
+ private EquandaSetterCache cache;
+
@Property
private ${table.Name} current;
@@ -129,9 +133,14 @@
}
}
- Object onActionFromDelete( int index )
+ public Object[] getDeleteContext()
{
- value.remove( index );
+ return new Object[] { getSetterId(), index };
+ }
+
+ Object onActionFromDelete( String setterId, int index )
+ {
+ ((SelectedSettings)cache.get( setterId )).getSelectedList().remove( index );
return null;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-10-06 08:15:23 UTC (rev 1168)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-10-06 11:16:34 UTC (rev 1169)
@@ -7,7 +7,7 @@
<div class="eqLLR" t:type="loop" volatile="true" source="value" value="current" index="index" rowsPerPage="7">
<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>
+ <div class="eqLLRE"><t:equanda.formactionlink t:id="Delete" context="deleteContext" 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>
<t:equanda.formactionlink t:id="Add" context="prop:setterId">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-06 08:15:30
|
Revision: 1168
http://equanda.svn.sourceforge.net/equanda/?rev=1168&view=rev
Author: triathlon98
Date: 2009-10-06 08:15:23 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
"public" not needed on interfaces
Modified Paths:
--------------
branches/0.9.4.1/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java
Modified: branches/0.9.4.1/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java
===================================================================
--- branches/0.9.4.1/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java 2009-10-06 08:05:16 UTC (rev 1167)
+++ branches/0.9.4.1/equanda-t5navigation/src/main/java/org/equanda/t5nav/services/NavigationContext.java 2009-10-06 08:15:23 UTC (rev 1168)
@@ -38,9 +38,9 @@
public interface NavigationContext
extends Serializable
{
- public String getId();
+ String getId();
- public boolean isValid();
+ boolean isValid();
/**
* invalidates the current NavigationContext
@@ -48,7 +48,7 @@
*
* @return redirect target to return to
*/
- public Object invalidate();
+ Object invalidate();
/**
* Adds a persistentField from a page to the NavigationContext
@@ -56,14 +56,14 @@
* @param pageName page name
* @param persistentField persistence info
*/
- public void addPersistentField( String pageName, PersistentFieldChange persistentField );
+ void addPersistentField( String pageName, PersistentFieldChange persistentField );
/**
* Remove all fields for a page.
*
* @param pageName the name of the page
*/
- public void removeAllFields( String pageName );
+ void removeAllFields( String pageName );
/**
* Return a Collection containing all persistent fields of a page
@@ -71,14 +71,14 @@
* @param pageName page name
* @return persistence info
*/
- public Collection<PersistentFieldChange> getPersistentFields( String pageName );
+ Collection<PersistentFieldChange> getPersistentFields( String pageName );
/**
* Get the id of the navigation which was active when this one was created
*
* @return previously active navigation id
*/
- public String getPreviousId();
+ String getPreviousId();
/**
* Get the redirect target user should return to when this navigation mini-conversation ends.
@@ -100,5 +100,4 @@
* @return array with the last few return targets
*/
NavigationTarget[] getRecentReturnTargets();
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-06 08:05:23
|
Revision: 1167
http://equanda.svn.sourceforge.net/equanda/?rev=1167&view=rev
Author: triathlon98
Date: 2009-10-06 08:05:16 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
EQ-366 extra row level div for style
Modified Paths:
--------------
branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-10-06 07:16:48 UTC (rev 1166)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/InlineLinkList.tml.vm 2009-10-06 08:05:16 UTC (rev 1167)
@@ -6,20 +6,22 @@
<div class="eqInl" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<input t:type="TextField" t:id="hiddenDeletedRows" class="nodisplay" />
- <div class="eqInlR" t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
+ <div t:id="pagedLoop" t:type="equanda/JSPagedLoop" volatile="true" source="value" value="current" index="index" rowsPerPage="7" additionalRowCount="prop:additionalRowCount" addRowLinkTitle="${dollar}{equanda-message:Add}" objectCreatorDelegate="prop:this">
<t:parameter name="empty"></t:parameter>
<t:parameter name="bottomBlock">
<t:if test="isCanAdd()">
<t:equanda.formactionlink t:id="Add">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
</t:if>
</t:parameter>
- <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>
+ <div class="eqInlR">
+ <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>
+ </div>
+ <div class="eqInlRD er-${dollar}{clientId}-${dollar}{index}">
+ <t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" setterIndexStart="clientId" setterIndexEnd="prop:index" editmode="true" canSwitch="false"/></t:if>
+ </div>
</div>
- <div class="eqInlRD er-${dollar}{clientId}-${dollar}{index}">
- <t:if t:test="current"><t:${table.VarName}.Edit value="current" showMetadata="prop:false" setterIndexStart="clientId" setterIndexEnd="prop:index" editmode="true" canSwitch="false"/></t:if>
- </div>
</div>
</div>
\ 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...> - 2009-10-06 07:16:57
|
Revision: 1166
http://equanda.svn.sourceforge.net/equanda/?rev=1166&view=rev
Author: triathlon98
Date: 2009-10-06 07:16:48 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
EQ-365 fix delete in generated LinkList component
Modified Paths:
--------------
branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2009-10-02 18:31:19 UTC (rev 1165)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2009-10-06 07:16:48 UTC (rev 1166)
@@ -36,6 +36,7 @@
import ${ejbPackage}.client.${table.Name};
import org.equanda.t5gui.SelectedSettings;
import org.equanda.t5gui.SelectedSettingsForSelect;
+import org.equanda.t5gui.services.EquandaSetterCache;
import org.equanda.t5nav.services.NavigationManager;
import ${package}.pages.${table.Name}EquandaAll;
import ${package}.pages.${table.Name}Edit;
@@ -79,6 +80,9 @@
@Inject
private NavigationManager navigationManager;
+ @Inject
+ private EquandaSetterCache cache;
+
@Property
private ${table.Name} current;
@@ -129,9 +133,14 @@
}
}
- Object onActionFromDelete( int index )
+ public Object[] getDeleteContext()
{
- value.remove( index );
+ return new Object[] { getSetterId(), index };
+ }
+
+ Object onActionFromDelete( String setterId, int index )
+ {
+ ((SelectedSettings)cache.get( setterId )).getSelectedList().remove( index );
return null;
}
Modified: branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-10-02 18:31:19 UTC (rev 1165)
+++ branches/0.9.4.1/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2009-10-06 07:16:48 UTC (rev 1166)
@@ -7,7 +7,7 @@
<div class="eqLLR" t:type="loop" volatile="true" source="value" value="current" index="index" rowsPerPage="7">
<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>
+ <div class="eqLLRE"><t:equanda.formactionlink t:id="Delete" context="deleteContext" 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>
<t:equanda.formactionlink t:id="Add" context="prop:setterId">${dollar}{equanda-message:Add}</t:equanda.formactionlink>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-10-02 18:31:31
|
Revision: 1165
http://equanda.svn.sourceforge.net/equanda/?rev=1165&view=rev
Author: triathlon98
Date: 2009-10-02 18:31:19 +0000 (Fri, 02 Oct 2009)
Log Message:
-----------
EQ-130 more fixes for links in inherited tables
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2009-09-30 20:08:03 UTC (rev 1164)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2009-10-02 18:31:19 UTC (rev 1165)
@@ -530,10 +530,18 @@
#foreach( $ck in $table.getCascadeKeep() )
#if ( $ck.isBidirectional() )
#if( $ck.isMultiple() )
+#if( "${ck.TableName}" == "${ck.FieldTable}" )
if ( !entity.get${ck.linkedFieldName}().isEmpty() )
#else
+ if ( entity instanceof DM${ck.FieldTable} && !((DM${ck.FieldTable})entity).get${ck.linkedFieldName}().isEmpty() )
+#end
+#else
+#if( "${ck.TableName}" == "${ck.FieldTable}" )
if ( null != entity.get${ck.linkedFieldName}() )
+#else
+ if ( entity instanceof DM${ck.FieldTable} && null != ((DM${ck.FieldTable})entity).get${ck.linkedFieldName}() )
#end
+#end
#else
if ( !entity.getEquanda${ck.TableName}${ck.FieldName}().isEmpty() )
#end
@@ -617,16 +625,28 @@
#foreach( $field in $table.LinkFields )
#if( $field.isEmbedded() )
#if( !$field.isMultiple() )
- if ( entity.get${field.Name}() != null )
+#if( "${field.Table}" == "${table.Name}" )
+#set( $var = "entity" )
+ if ( ${var}.get${field.Name}() != null )
+#else
+#set( $var = "((DM${field.Table})entity)" )
+ if ( entity instanceof DM${field.Table} && ${var}.get${field.Name}() != null )
+#end
{
${field.LinkTable.Name}SelectorEJB remEjb = EquandaGlobal.get${field.LinkTable.Name}Selector();
- remEjb.removeEntityBean( entity.get${field.Name}().getId() );
+ remEjb.removeEntityBean( ${var}.get${field.Name}().getId() );
remEjb.remove();
}
#else
- if ( !entity.get${field.Name}().isEmpty() )
+#if( "${field.Table}" == "${table.Name}" )
+#set( $var = "entity" )
+ if ( !${var}.get${field.Name}().isEmpty() )
+#else
+#set( $var = "((DM${field.Table})entity)" )
+ if ( entity instanceof DM${field.Table} && !${var}.get${field.Name}().isEmpty() )
+#end
{
- Collection<DM${field.LinkTable.Name}> col = entity.get${field.Name}();
+ Collection<DM${field.LinkTable.Name}> col = ${var}.get${field.Name}();
Collection<Uoid> colTmp = new ArrayList<Uoid>();
for ( DM${field.LinkTable.Name} colit : col ) colTmp.add( colit.getId() );
${field.LinkTable.Name}SelectorEJB remEjb = EquandaGlobal.get${field.LinkTable.Name}Selector();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-09-30 20:08:12
|
Revision: 1164
http://equanda.svn.sourceforge.net/equanda/?rev=1164&view=rev
Author: triathlon98
Date: 2009-09-30 20:08:03 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
EQ-364 DeltaBar component
Modified Paths:
--------------
branches/0.9.4.1/equanda-tapestry5/src/site/site.xml
Added Paths:
-----------
branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
branches/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki
Copied: branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java (from rev 1163, trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java)
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java (rev 0)
+++ branches/0.9.4.1/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-09-30 20:08:03 UTC (rev 1164)
@@ -0,0 +1,83 @@
+/**
+ * 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.components;
+
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
+
+/**
+ * Component which display a horizontal bar to display from and to values.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class DeltaBar
+{
+ @Property
+ @Parameter( value = "0", required = true )
+ private int fromPercentage;
+
+ @Property
+ @Parameter( value = "0", required = true )
+ private int toPercentage;
+
+ @Property
+ @Parameter( value = "200", required = false, defaultPrefix = "literal" )
+ private int width;
+
+ @Property
+ @Parameter( value = "gray", required = false, defaultPrefix = "literal" )
+ private String borderColour;
+
+ @Property
+ @Parameter( value = "transparent", required = false, defaultPrefix = "literal" )
+ private String backgroundColour;
+
+ @Property
+ @Parameter( value = "red", required = false, defaultPrefix = "literal" )
+ private String fromColour;
+
+ @Property
+ @Parameter( value = "literal:lightgreen", required = false, defaultPrefix = "literal" )
+ private String toColour;
+
+ @Property
+ @Parameter( value = "black", required = false, defaultPrefix = "literal" )
+ private String textColour;
+
+ public int getFromWidth()
+ {
+ return (int)Math.round( width / 100.0 * fromPercentage );
+ }
+
+ public int getToWidth()
+ {
+ return (int)Math.round( width / 100.0 * toPercentage );
+ }
+
+ public int getTotalWidth()
+ {
+ return width;
+ }
+}
Copied: branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml (from rev 1163, trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml)
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml (rev 0)
+++ branches/0.9.4.1/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-09-30 20:08:03 UTC (rev 1164)
@@ -0,0 +1,40 @@
+<div style="position: relative; /* IE is dumb */
+width: ${totalWidth}px;
+border: 1px solid ${borderColour};
+background: ${backgroundColour};
+padding: 2px; ">
+ <strong style="width: ${toWidth}px;
+display: block;
+position: absolute;
+background: ${toColour};
+text-align: right;
+padding: 0;
+height: 1em;
+line-height: 1em; "></strong>
+ <strong style="width: ${fromWidth}px;
+display: block;
+position: absolute;
+background: ${fromColour};
+text-align: left;
+padding: 0;
+height: 1em;
+line-height: 1em; "></strong>
+ <strong style="width: ${width}px;
+display: block;
+position: absolute;
+background: transparent;
+text-align: right;
+color: ${textColour};
+padding: 0 3px;
+height: 1em;
+line-height: 1em; ">${toPercentage}%</strong>
+ <strong style="width: ${width}px;
+display: block;
+position: relative;
+background: transparent;
+text-align: left;
+color: ${textColour};
+padding: 0 3px;
+height: 1em;
+line-height: 1em; ">${fromPercentage}%</strong>
+</div>
\ No newline at end of file
Modified: branches/0.9.4.1/equanda-tapestry5/src/site/site.xml
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/site/site.xml 2009-09-30 19:59:37 UTC (rev 1163)
+++ branches/0.9.4.1/equanda-tapestry5/src/site/site.xml 2009-09-30 20:08:03 UTC (rev 1164)
@@ -10,6 +10,7 @@
<item name="Introduction" href="index.html"/>
<item name="Components" collapse="false">
<item name="Accordion" href="accordion.html"/>
+ <item name="DeltaBar" href="deltabar.html"/>
<item name="FormActionLink" href="formactionlink.html"/>
<item name="FormSupport" href="formsupport.html"/>
<item name="FormTraversal" href="formtraversal.html"/>
Copied: branches/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki (from rev 1163, trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki)
===================================================================
--- branches/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki (rev 0)
+++ branches/0.9.4.1/equanda-tapestry5/src/site/wiki/deltabar.wiki 2009-09-30 20:08:03 UTC (rev 1164)
@@ -0,0 +1,21 @@
+h1. DeltaBar
+
+The deltabar component allows display of from-to percentage evolutions in a graphical way.
+
+There are a couple of possible parameters :
+- fromPercentage: from percentage (required), should be between 0 and 100.
+- toPercentage : end percentage (required), should be an int between 0 and 100 and should be larger than "fromPercentage".
+- width : width of the component (excluding borders), defaults to 200.
+- borderColour : border colour, defaults to "gray".
+- backgroundColour : background colour for the component, defaults to "transparent".
+- fromColour : colour for the "from" bar, defaults to "red".
+- toColour : colour for the "to" bar, defaults to "lightgreen".
+- toColour : colour for the percentage indications, defaults to "black".
+
+<code>
+<t:equanda.DeltaBar fromPercentage="literal:8" toPercentage="literal:100" />
+<t:equanda.DeltaBar fromPercentage="literal:0" toPercentage="literal:75" />
+<span t:type="equanda/DeltaBar" fromPercentage="literal:76" toPercentage="literal:76" />
+<t:equanda.DeltaBar fromPercentage="literal:76" toPercentage="literal:85"
+ width="400" borderColour="blue" backgroundColour="black" textColour="white" fromColour="darkgray" toColour="green" />
+</code>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-09-30 19:59:46
|
Revision: 1163
http://equanda.svn.sourceforge.net/equanda/?rev=1163&view=rev
Author: triathlon98
Date: 2009-09-30 19:59:37 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
EQ-364 DeltaBar component
Modified Paths:
--------------
trunk/equanda-tapestry5/src/site/site.xml
Added Paths:
-----------
trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki
Added: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java (rev 0)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/DeltaBar.java 2009-09-30 19:59:37 UTC (rev 1163)
@@ -0,0 +1,83 @@
+/**
+ * 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.components;
+
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
+
+/**
+ * Component which display a horizontal bar to display from and to values.
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class DeltaBar
+{
+ @Property
+ @Parameter( value = "0", required = true )
+ private int fromPercentage;
+
+ @Property
+ @Parameter( value = "0", required = true )
+ private int toPercentage;
+
+ @Property
+ @Parameter( value = "200", required = false, defaultPrefix = "literal" )
+ private int width;
+
+ @Property
+ @Parameter( value = "gray", required = false, defaultPrefix = "literal" )
+ private String borderColour;
+
+ @Property
+ @Parameter( value = "transparent", required = false, defaultPrefix = "literal" )
+ private String backgroundColour;
+
+ @Property
+ @Parameter( value = "red", required = false, defaultPrefix = "literal" )
+ private String fromColour;
+
+ @Property
+ @Parameter( value = "literal:lightgreen", required = false, defaultPrefix = "literal" )
+ private String toColour;
+
+ @Property
+ @Parameter( value = "black", required = false, defaultPrefix = "literal" )
+ private String textColour;
+
+ public int getFromWidth()
+ {
+ return (int)Math.round( width / 100.0 * fromPercentage );
+ }
+
+ public int getToWidth()
+ {
+ return (int)Math.round( width / 100.0 * toPercentage );
+ }
+
+ public int getTotalWidth()
+ {
+ return width;
+ }
+}
Added: trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml
===================================================================
--- trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml (rev 0)
+++ trunk/equanda-tapestry5/src/main/resources/org/equanda/tapestry5/components/DeltaBar.tml 2009-09-30 19:59:37 UTC (rev 1163)
@@ -0,0 +1,40 @@
+<div style="position: relative; /* IE is dumb */
+width: ${totalWidth}px;
+border: 1px solid ${borderColour};
+background: ${backgroundColour};
+padding: 2px; ">
+ <strong style="width: ${toWidth}px;
+display: block;
+position: absolute;
+background: ${toColour};
+text-align: right;
+padding: 0;
+height: 1em;
+line-height: 1em; "></strong>
+ <strong style="width: ${fromWidth}px;
+display: block;
+position: absolute;
+background: ${fromColour};
+text-align: left;
+padding: 0;
+height: 1em;
+line-height: 1em; "></strong>
+ <strong style="width: ${width}px;
+display: block;
+position: absolute;
+background: transparent;
+text-align: right;
+color: ${textColour};
+padding: 0 3px;
+height: 1em;
+line-height: 1em; ">${toPercentage}%</strong>
+ <strong style="width: ${width}px;
+display: block;
+position: relative;
+background: transparent;
+text-align: left;
+color: ${textColour};
+padding: 0 3px;
+height: 1em;
+line-height: 1em; ">${fromPercentage}%</strong>
+</div>
\ No newline at end of file
Modified: trunk/equanda-tapestry5/src/site/site.xml
===================================================================
--- trunk/equanda-tapestry5/src/site/site.xml 2009-09-30 19:40:07 UTC (rev 1162)
+++ trunk/equanda-tapestry5/src/site/site.xml 2009-09-30 19:59:37 UTC (rev 1163)
@@ -10,6 +10,7 @@
<item name="Introduction" href="index.html"/>
<item name="Components" collapse="false">
<item name="Accordion" href="accordion.html"/>
+ <item name="DeltaBar" href="deltabar.html"/>
<item name="FormActionLink" href="formactionlink.html"/>
<item name="FormSupport" href="formsupport.html"/>
<item name="FormTraversal" href="formtraversal.html"/>
Added: trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki
===================================================================
--- trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki (rev 0)
+++ trunk/equanda-tapestry5/src/site/wiki/deltabar.wiki 2009-09-30 19:59:37 UTC (rev 1163)
@@ -0,0 +1,21 @@
+h1. DeltaBar
+
+The deltabar component allows display of from-to percentage evolutions in a graphical way.
+
+There are a couple of possible parameters :
+- fromPercentage: from percentage (required), should be between 0 and 100.
+- toPercentage : end percentage (required), should be an int between 0 and 100 and should be larger than "fromPercentage".
+- width : width of the component (excluding borders), defaults to 200.
+- borderColour : border colour, defaults to "gray".
+- backgroundColour : background colour for the component, defaults to "transparent".
+- fromColour : colour for the "from" bar, defaults to "red".
+- toColour : colour for the "to" bar, defaults to "lightgreen".
+- toColour : colour for the percentage indications, defaults to "black".
+
+<code>
+<t:equanda.DeltaBar fromPercentage="literal:8" toPercentage="literal:100" />
+<t:equanda.DeltaBar fromPercentage="literal:0" toPercentage="literal:75" />
+<span t:type="equanda/DeltaBar" fromPercentage="literal:76" toPercentage="literal:76" />
+<t:equanda.DeltaBar fromPercentage="literal:76" toPercentage="literal:85"
+ width="400" borderColour="blue" backgroundColour="black" textColour="white" fromColour="darkgray" toColour="green" />
+</code>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-09-30 19:40:20
|
Revision: 1162
http://equanda.svn.sourceforge.net/equanda/?rev=1162&view=rev
Author: triathlon98
Date: 2009-09-30 19:40:07 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
EQ-364 DeltaBar component example
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 2009-09-29 16:40:41 UTC (rev 1161)
+++ t5-equanda-example/pom.xml 2009-09-30 19:40:07 UTC (rev 1162)
@@ -41,6 +41,22 @@
<version>${chenillekit-version}</version>
</dependency>
+ <!-- exclude libraries pulled in by tapestry, for war -->
+ <!--
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.9.0.GA</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>4.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ -->
+
</dependencies>
<build>
<finalName>t5example</finalName>
@@ -81,11 +97,10 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<!--<archiveClasses>true</archiveClasses>-->
- <!-- needs to be uncommented when using the JBossClassLoader
+ <!-- needs to be uncommented when using the JBossClassLoader -->
<warSourceExcludes>
WEB-INF/lib/javassist*.jar,WEB-INF/lib/log4j*.jar,WEB-INF/lib/commons-codec*.jar,WEB-INF/lib/commons-collections*.jar,WEB-INF/lib/commons-httpclient*.jar,WEB-INF/lib/commons-logging*.jar
</warSourceExcludes>
- -->
</configuration>
</plugin>
<plugin>
@@ -159,7 +174,7 @@
<properties>
<equanda-release-version>0.9.5-SNAPSHOT</equanda-release-version>
- <tapestry-release-version>5.1.0.1</tapestry-release-version>
+ <tapestry-release-version>5.1.0.3</tapestry-release-version>
<chenillekit-version>1.0.0</chenillekit-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 2009-09-29 16:40:41 UTC (rev 1161)
+++ t5-equanda-example/src/main/resources/org/equanda/example/t5/pages/Start.tml 2009-09-30 19:40:07 UTC (rev 1162)
@@ -140,20 +140,26 @@
<blockquote><span t:type="equanda/TextAreaAutoExpander"/></blockquote> somewhere in your page
(or layout component).</p>
</t:parameter>
- <t:parameter name="title8">Slider</t:parameter>
+ <t:parameter name="title8">DeltaBar</t:parameter>
<t:parameter name="content8">
- <p>The Slider component allows selecting a numeric value</p>
+ <p>The DeltaBar component allow display a simple horizontal bar with from and to values.</p>
- <p>A value between one and hundred with precision of one.<br /> <span t:type="equanda/Slider" value="slider1" min="1" max="100" inc="1"/></p>
- <span t:type="equanda/Slider" value="slider1" min="1" max="100" inc="1" disabled="literal:false"/>
- <p>A value between zero and one with precision of .5.<br /> <span t:type="equanda/Slider" value="slider2" min="0" max="1" inc=".05"/></p>
- <span t:type="equanda/Slider" value="slider2" min="0" max="1" inc=".05" disabled="literal:false"/>
- <p>A disabled slider.<br /> <span t:type="equanda/Slider" value="slider3" min="1" max="100" inc="1" disabled="literal:true"/></p>
- <span t:type="equanda/Slider" value="slider3" min="1" max="100" inc="1" disabled="literal:true"/>
- <p>A value between one and hundred, incrementing by 10.<br /> <span t:type="equanda/Slider" value="slider4" min="1" max="100" inc="10"/></p>
- <span t:type="equanda/Slider" value="slider4" min="1" max="100" inc="10" disabled="literal:false"/>
- <p>A value between zero and five with precision of .1.<br /> <span t:type="equanda/Slider" value="slider5" min="0" max="5" inc=".1"/></p>
- <span t:type="equanda/Slider" value="slider5" min="0" max="5" inc=".1" disabled="literal:false"/>
+ <t:equanda.DeltaBar fromPercentage="literal:27" toPercentage="literal:82" />
+
+ <p>Usage is simple, just include
+ <blockquote><equanda.DeltaBar fromPercentage="literal:27" toPercentage="literal:82" /></blockquote>
+ somewhere in your page (or layout component).</p>
+
+ <t:equanda.DeltaBar fromPercentage="literal:8" toPercentage="literal:100" />
+ <t:equanda.DeltaBar fromPercentage="literal:0" toPercentage="literal:75" />
+ <t:equanda.DeltaBar fromPercentage="literal:76" toPercentage="literal:76" />
+ <t:equanda.DeltaBar fromPercentage="literal:76" toPercentage="literal:85"
+ width="400" borderColour="blue" backgroundColour="black" textColour="white" fromColour="darkgray" toColour="green" />
+ <p>For this last, more complete example, the code is
+ <blockquote><t:equanda.DeltaBar fromPercentage="literal:76" toPercentage="literal:85"
+ width="400" borderColour="blue" backgroundColour="black" textColour="white" fromColour="darkgray" toColour="green" /></blockquote>
+ .</p>
+
</t:parameter>
</span>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-09-29 16:40:55
|
Revision: 1161
http://equanda.svn.sourceforge.net/equanda/?rev=1161&view=rev
Author: triathlon98
Date: 2009-09-29 16:40:41 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
EQ-130 fix import problems
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm
trunk/equanda-generate/src/main/velocity/import/FieldMap.java.vm
trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm
trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java
trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java
trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java
trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java
Modified: trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm 2009-09-24 11:46:49 UTC (rev 1160)
+++ trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm 2009-09-29 16:40:41 UTC (rev 1161)
@@ -39,6 +39,7 @@
import ${ejbPackage}.client.*;
import org.equanda.persistence.EquandaProxy;
import org.equanda.persistence.Uoid;
+import org.equanda.ymport.ImportHandler;
public class DatabaseMap extends DatabaseMapAdapter
{
@@ -80,11 +81,15 @@
#if( ${hasMultiple}=="false" )
tableHandler = new ${table.Name}TableHandler()
{
- public ${table.Name} select( ${table.Name}SelectorEJB selector, Import${table.Name} val ) throws Exception
+ public EquandaProxy select( EquandaProxy genVal ) throws Exception
{
+ Import${table.Name} val = (Import${table.Name})genVal;
+ ${table.Name}SelectorEJB selector = EquandaGlobal.get${table.Name}Selector();
#if( $select.isSingle() )
- return selector.select${select.Name}( $params );
+ EquandaProxy res = selector.select${select.Name}( $params );
+ if ( null == res) res = val;
#else
+ EquandaProxy res = val;
List<${table.Name}> col = selector.select${select.Name}( $params );
if ( col.size() > 1 )
{
@@ -92,10 +97,10 @@
}
else if ( col.size() == 1 )
{
- return col.get(0);
+ res = col.get(0);
}
- return null;
#end
+ return res;
}
};
TABLES_MAP.put("${table.Name}/${select.Name}", tableHandler );
@@ -190,10 +195,11 @@
## without a selector :
tableHandler = new ${table.Name}TableHandler()
{
- public ${ejbPackage}.client.${table.Name} select( ${table.Name}SelectorEJB selector, Import${table.Name} val ) throws Exception
+ public EquandaProxy select( EquandaProxy genVal ) throws Exception
{
+ Import${table.Name} val = (Import${table.Name})genVal;
${ejbPackage}.client.${table.Name} obj = null;
- selector = EquandaGlobal.get${table.Name}Selector();
+ ${table.Name}SelectorEJB selector = EquandaGlobal.get${table.Name}Selector();
// try all local&single selectors that match
// also try to select by id if it was given
@@ -216,7 +222,7 @@
}
#end ## is-valid-select
#end ## foreach select
- return null;
+ return val;
}
};
TABLES_MAP.put("${table.Name}", tableHandler);
@@ -251,6 +257,12 @@
return handler.ymport( proxyObject );
}
+ public EquandaProxy ymport( EquandaProxy proxy, ImportHandler importHandler, Collection collection )
+ throws Exception
+ {
+ return handler.ymport( proxy, importHandler, collection );
+ }
+
public EquandaProxy getEmptyObject()
{
EquandaProxy proxy = handler.getEmptyObject();
Modified: trunk/equanda-generate/src/main/velocity/import/FieldMap.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/import/FieldMap.java.vm 2009-09-24 11:46:49 UTC (rev 1160)
+++ trunk/equanda-generate/src/main/velocity/import/FieldMap.java.vm 2009-09-29 16:40:41 UTC (rev 1161)
@@ -32,6 +32,7 @@
package $package;
import org.equanda.persistence.EquandaImportProxy;
+import org.equanda.persistence.EquandaProxy;
import org.equanda.ymport.FieldHandler;
import org.equanda.ymport.FieldMapAdapter;
import org.equanda.ymport.FieldParser;
@@ -77,7 +78,7 @@
public void setField( Object proxyObject, Object fieldValue )
throws ImportHandlerException
{
- Import${table.Name} obj = (Import${table.Name}) proxyObject;
+ ${ejbPackage}.client.${table.Name} obj = (${ejbPackage}.client.${table.Name}) proxyObject;
#if( !$field.isLink() )
## tests to assure modified is set
#if( $field.isBoolean() ) obj.set${field.Name}( true );#end
@@ -121,9 +122,13 @@
#end
new FieldHandler($par)
{
- public void setMultiple( EquandaImportProxy proxy, Collection value )
+ public void setMultiple( EquandaProxy proxy, Collection value )
{
- ((Import${table.Name}) proxy).set${field.Name}( value );
+#if( $field.isImmutable())
+ if ( proxy instanceof Import${table.Name} ) ((Import${table.Name}) proxy).set${field.Name}( value );
+#else
+ ((${ejbPackage}.client.${table.Name}) proxy).set${field.Name}( value );
+#end
}
} );
#end##multiple
Modified: trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm 2009-09-24 11:46:49 UTC (rev 1160)
+++ trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm 2009-09-29 16:40:41 UTC (rev 1161)
@@ -45,25 +45,4 @@
throw new RuntimeException(e);
}
}
-
- public Object ymport( Object proxyObject ) throws Exception
- {
- Import${table.Name} proxy = (Import${table.Name}) proxyObject;
- proxy.equandaUpdate();
- return proxy;
- }
-
- /**
- * Try select a value to update or return null
- *
- * @param selector selector to use when searching
- * @param proxy import proxy to select
- * @return found bean or null
- * @throws Exception oops
- */
- public ${ejbPackage}.client.${table.Name} select( ${table.Name}SelectorEJB selector, Import${table.Name} proxy )
- throws Exception
- {
- return null;
- }
}
\ No newline at end of file
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java 2009-09-24 11:46:49 UTC (rev 1160)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java 2009-09-29 16:40:41 UTC (rev 1161)
@@ -25,6 +25,7 @@
package org.equanda.ymport;
import org.equanda.persistence.EquandaImportProxy;
+import org.equanda.persistence.EquandaProxy;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,8 +42,11 @@
public void setField( Object proxyObject, Object fieldValue )
throws ImportHandlerException
{
- EquandaImportProxy obj = (EquandaImportProxy) proxyObject;
- obj.setId( ImportParser.parseString( fieldValue ) );
+ if ( proxyObject instanceof EquandaImportProxy )
+ {
+ EquandaImportProxy obj = (EquandaImportProxy) proxyObject;
+ obj.setId( ImportParser.parseString( fieldValue ) );
+ }
}
};
public static final FieldHandler EQUANDA_TYPE = new FieldHandler()
@@ -50,7 +54,7 @@
public void setField( Object proxyObject, Object fieldValue )
throws ImportHandlerException
{
- EquandaImportProxy obj = (EquandaImportProxy) proxyObject;
+ EquandaProxy obj = (EquandaProxy) proxyObject;
obj.setEquandaType( ImportParser.parseString( fieldValue ) );
}
};
@@ -73,7 +77,7 @@
throws ImportHandlerException
{
// this is the default handling for a multiple field
- EquandaImportProxy obj = (EquandaImportProxy) proxyObject;
+ EquandaProxy obj = (EquandaProxy) proxyObject;
Collection value;
if ( parser != null )
{
@@ -105,7 +109,7 @@
setMultiple( obj, value );
}
- public void setMultiple( EquandaImportProxy proxy, Collection value )
+ public void setMultiple( EquandaProxy proxy, Collection value )
{
// to be provided for multiple fields
}
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java 2009-09-24 11:46:49 UTC (rev 1160)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/ImportHandler.java 2009-09-29 16:40:41 UTC (rev 1161)
@@ -51,35 +51,42 @@
{
try
{
- Object res;
if ( fieldHandlers == null )
{
- res = tableHandler.ymport( data );
+ return tableHandler.ymport( data );
}
else
{
- EquandaProxy proxy = tableHandler.getEmptyObject();
- Iterator itData = data.iterator();
- Iterator itFields = fieldHandlers.iterator();
- while ( itData.hasNext() && itFields.hasNext() )
- {
- FieldHandler fh = (FieldHandler) itFields.next();
- Object value = itData.next();
- if ( value != null )
- {
- fh.setField( proxy, value );
- }
- }
- res = tableHandler.ymport( proxy );
+ return ymport( tableHandler.getEmptyObject(), data );
}
- return res;
}
+ catch ( ImportHandlerException ihe )
+ {
+ throw ihe;
+ }
catch ( Exception ex )
{
throw new ImportHandlerException( ex );
}
}
+ public EquandaProxy ymport( EquandaProxy proxy, Collection data )
+ throws Exception
+ {
+ Iterator itData = data.iterator();
+ Iterator itFields = fieldHandlers.iterator();
+ while ( itData.hasNext() && itFields.hasNext() )
+ {
+ FieldHandler fh = (FieldHandler) itFields.next();
+ Object value = itData.next();
+ if ( value != null )
+ {
+ fh.setField( proxy, value );
+ }
+ }
+ return tableHandler.ymport( proxy, this, data );
+ }
+
/**
* Build an importhandler for a definition
*
@@ -92,6 +99,7 @@
throws ImportHandlerException
{
String table = ImportParser.parseTableTable( line );
+ System.out.println( "!!!!!!! get table handler for " + table );
TableHandler tableHandler = databaseMap.getTableHandler( table );
FieldMap fieldMap = databaseMap.getFieldMap( table );
Collection fields = buildFieldList( databaseMap, fieldMap, line );
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java 2009-09-24 11:46:49 UTC (rev 1160)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java 2009-09-29 16:40:41 UTC (rev 1161)
@@ -26,6 +26,8 @@
import org.equanda.persistence.EquandaProxy;
+import java.util.Collection;
+
/**
* Table handler. Builds a proxy object from the collection of fields
*
@@ -52,6 +54,25 @@
throws Exception;
/**
+ * There are two possible modes of action depending on the kind of table handler.
+ * <p/>
+ * Normal table handlers try to update the record if a match exists and create the
+ * record if there is no match. These are passed a proxy object.
+ * <p/>
+ * Selectors are passed a Collection of parameters (or a Collection with
+ * Collections with parameters). They search for the records using these parameters and
+ * return either a single proxy object or a collection of proxy objects.
+ *
+ * @param proxyObject proxy to import
+ * @param importHandler handler which can be used to re-import the data
+ * @param data field data to import
+ * @return proxy or list of proxies
+ * @throws Exception on problems
+ */
+ EquandaProxy ymport( EquandaProxy proxyObject, ImportHandler importHandler, Collection data )
+ throws Exception;
+
+ /**
* Create an empty proxy object for this kind of table
*
* @return empty proxy object
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java 2009-09-24 11:46:49 UTC (rev 1160)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandlerBase.java 2009-09-29 16:40:41 UTC (rev 1161)
@@ -24,8 +24,10 @@
package org.equanda.ymport;
+import org.equanda.persistence.EquandaProxy;
+
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.ArrayList;
/**
* Base implementation for a TableHandler
@@ -51,10 +53,50 @@
if ( !( ccPar.iterator().next() instanceof Collection ) )
{
ccPar = new ArrayList<Collection<Object>>();
- ccPar.add( (Collection<Object>)par );
+ ccPar.add( (Collection<Object>) par );
}
}
return ccPar;
}
+ public Object ymport( Object object )
+ throws Exception
+ {
+ return null;
+ }
+
+ public EquandaProxy ymport( EquandaProxy proxy, ImportHandler importHandler, Collection collection )
+ throws Exception
+ {
+ System.out.println( "!!!!!!! TableHandlerBase going to update one" + proxy );
+ if ( null == proxy.getId() )
+ {
+ System.out.println( "!!!!!!! TableHandlerBase going to test new " + proxy );
+ proxy = select( proxy );
+ System.out.println( "!!!!!!! TableHandlerBase going to test res " + proxy );
+ if ( null != proxy.getId() )
+ {
+ System.out.println( "!!!!!!! TableHandlerBase going read fields again" );
+ importHandler.ymport( proxy, collection );
+ }
+ }
+ System.out.println( "!!!!!!! TableHandlerBase going to update" );
+ proxy.equandaUpdate();
+ return proxy;
+ }
+
+ /**
+ * Try select a value to update or return null
+ *
+ * @param proxy import proxy to select
+ * @return found bean or null
+ * @throws Exception oops
+ */
+ public EquandaProxy select( EquandaProxy proxy )
+ throws Exception
+ {
+ System.out.println( "!!!!!!! TableHandlerBase no-op select" );
+ return proxy;
+ }
+
}
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java 2009-09-24 11:46:49 UTC (rev 1160)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java 2009-09-29 16:40:41 UTC (rev 1161)
@@ -568,7 +568,7 @@
assertNull( " update should have set FirstName to null ", cocoonMan.getFirstName() );
assertEquals( " update should not change the Height value ", 10.0, cocoonMan.getHeight(), 0.0 );
assertFalse( " update should have set Employed to false ", cocoonMan.getEmployed() );
- assertTrue( " update should have emptied PreviouesJobs ", cocoonMan.getPreviousJobs().isEmpty() );
+ assertTrue( " update should have emptied PreviousJobs ", cocoonMan.getPreviousJobs().isEmpty() );
// clean
cocoonMan.removeEntityBean();
@@ -662,8 +662,8 @@
// verify import
Car carProxy = Car.selectId( uoid );
assertNotNull( carProxy );
- assertEquals( " should have Brand set ", car.getBrand(), brand );
- assertEquals( " update should have set Extra ", car.getExtra(), extra );
+ assertEquals( " should have Brand set ", brand, carProxy.getBrand() );
+ assertEquals( " update should have set Extra ", extra, carProxy.getExtra() );
// clean
car.removeEntityBean();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2009-09-24 11:47:07
|
Revision: 1160
http://equanda.svn.sourceforge.net/equanda/?rev=1160&view=rev
Author: triathlon98
Date: 2009-09-24 11:46:49 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
EQ-347 set initial statusses, EQ-349 indicate role, EQ-361 allow (un)select all actions/selects
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt
trunk/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js
Modified: trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-client/src/main/java/org/equanda/client/AuthAndConfigPages.java 2009-09-24 11:46:49 UTC (rev 1160)
@@ -36,7 +36,7 @@
*
* @param isGuiAdmin The value to set the GUI Admin flag to
*/
- void setIsGuiAdmin( boolean isGuiAdmin );
+ void setGuiAdmin( boolean isGuiAdmin );
/**
* Set the role being used
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 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-client/src/main/resources/org/equanda/translations/translations-common.txt 2009-09-24 11:46:49 UTC (rev 1160)
@@ -521,6 +521,9 @@
.label.en Configure
.key authAndConfig.label.Enable/equanda-fixed
.label.en Enable
+.key authAndConfig.label.Role/equanda-fixed
+.label.en Role :_
+.label.nl Rol :_
.key authAndConfig.select.Role/equanda-fixed
.label.en Choose the role you wish to edit, or leave blank to edit the current user.
.key authAndConfig.select.Prohibited/equanda-fixed
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/AuthAndConfigGroup.tml.vm 2009-09-24 11:46:49 UTC (rev 1160)
@@ -10,11 +10,11 @@
$!{group.Name} |
-#set ($readBox="${group.Name}_groupReadCheck")
-#set ($writeBox="${group.Name}_groupWriteCheck")
-#set ($listBox="${group.Name}_groupListCheck")
-#set ($sumBox="${group.Name}_groupSumCheck")
-#set ($printBox="${group.Name}_groupPrintCheck")
+#set( $readBox = "${group.Name}_groupReadCheck" )
+#set( $writeBox = "${group.Name}_groupWriteCheck" )
+#set( $listBox = "${group.Name}_groupListCheck" )
+#set( $sumBox = "${group.Name}_groupSumCheck" )
+#set( $printBox = "${group.Name}_groupPrintCheck" )
<input t:id="${readBox}" name="${readBox}" value="${readBox}"
onclick="eqHandlePageBox( ${readBox}, '$!{group.Name}', '_readCheck', '${writeBox}', ${listBox}, ${sumBox}, ${printBox} )"
@@ -63,12 +63,12 @@
</div>
<br/>
-#foreach( $field in $group.Fields)
-#set ($readBox="${field.Name}_readCheck")
-#set ($writeBox="${field.Name}_writeCheck")
-#set ($listBox="${field.Name}_listCheck")
-#set ($summaryBox="${field.Name}_sumCheck")
-#set ($printBox="${field.Name}_printCheck")
+#foreach( $field in $group.Fields )
+#set( $readBox = "${field.Name}_readCheck" )
+#set( $writeBox = "${field.Name}_writeCheck" )
+#set( $listBox = "${field.Name}_listCheck" )
+#set( $summaryBox = "${field.Name}_sumCheck" )
+#set( $printBox = "${field.Name}_printCheck" )
## if the field is a link it should only be displayed if the target table is visible
#if( ${field.isLink()} )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.java.vm 2009-09-24 11:46:49 UTC (rev 1160)
@@ -45,6 +45,7 @@
import org.apache.tapestry5.*;
import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.services.ComponentSource;
import org.apache.tapestry5.runtime.Component;
@@ -77,60 +78,57 @@
private NavigationManager navigationManager;
@Persist
- private String roleName;
- public String getRoleName()
+ private boolean guiAdmin;
+ public void setGuiAdmin( boolean guiAdmin )
{
- return roleName;
+ this.guiAdmin = guiAdmin;
}
+ public boolean isGuiAdmin()
+ {
+ return guiAdmin;
+ }
+
+ @Persist
+ private String roleName;
public void setRoleName( String roleName )
{
this.roleName = roleName;
- }
-
- @Persist
- private boolean isGuiAdmin;
- public boolean getIsGuiAdmin()
+ }
+ public String getRoleName()
{
- return isGuiAdmin;
- }
- public void setIsGuiAdmin( boolean isGuiAdmin )
- {
- this.isGuiAdmin = isGuiAdmin;
+ return roleName;
}
-
+
private boolean writeAllowed;
public boolean getWriteAllowed()
{
- return getIsGuiAdmin() && (getRoleName() != null);
+ return guiAdmin && (getRoleName() != null);
}
private Object nextPage;
- public void initPage( String roleName, boolean isGuiAdmin )
+ public void initPage( String roleName, boolean guiAdmin )
{
setRoleName( roleName );
- setIsGuiAdmin( isGuiAdmin );
+ this.guiAdmin = guiAdmin;
}
#foreach( $table in $dm.RootTables )
#set ($readBox="${table.Name}_readCheck")
#set ($writeBox="${table.Name}_writeCheck")
#set ($deleteBox="${table.Name}_deleteCheck")
- @Persist
+ @Persist
+ @Property
private boolean $readBox;
@Persist
+ @Property
private boolean $writeBox;
@Persist
+ @Property
private boolean $deleteBox;
- public boolean get$readBox(){ return $readBox; }
- public void set$readBox( boolean val ){ this.$readBox = val; }
- public boolean get$writeBox(){ return $writeBox; }
- public void set$writeBox( boolean val ){ this.$writeBox = val; }
- public boolean get$deleteBox(){ return $deleteBox; }
- public void set$deleteBox( boolean val ){ this.$deleteBox = val; }
public Object[] getcontext_${table.Name}()
{
// Context values may not be null or blank.
- return new Object[] { "${table.Name}", getRoleName() != null ? getRoleName() : noRoleIndicator, getIsGuiAdmin() ? "on" : "off"};
+ return new Object[] { "${table.Name}", getRoleName() != null ? getRoleName() : noRoleIndicator, guiAdmin ? "on" : "off"};
}
#end
@@ -140,7 +138,7 @@
* @param readBox A boolean value indicating whether to set this key readable
* @param writeBox A boolean value indicating whether to set this key writable
* @param deleteBox A boolean value indicating whether to set this key to enable delete
- * @throws EquandaException
+ * @throws EquandaException persistence problems
*/
private void setAuths( String tableName, boolean readBox, boolean writeBox, boolean deleteBox ) throws EquandaException
{
@@ -160,7 +158,7 @@
aacProvider.setDelete(key);
}
- if( readBox == false && writeBox == false && deleteBox == false )
+ if( !readBox && !writeBox && !deleteBox )
{
aacProvider.setHidden(key);
}
@@ -228,7 +226,7 @@
if( this.roleName != null )
{
- EquandaRole thisRole = EquandaRole.selectRole(this.roleName);
+ EquandaRole thisRole = EquandaRole.selectRole( this.roleName );
thisRole.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisRole.equandaUpdate();
}
@@ -251,9 +249,9 @@
#set ($readBox="${table.Name}_readCheck")
#set ($writeBox="${table.Name}_writeCheck")
#set ($deleteBox="${table.Name}_deleteCheck")
- set${readBox}( aacProvider.isReadable( "table.${table.Name}") );
- set${writeBox}( aacProvider.isWritable( "table.${table.Name}") );
- set${deleteBox}( aacProvider.isDeletable( "table.${table.Name}") );
+ ${readBox} = aacProvider.isReadable( "table.${table.Name}");
+ ${writeBox} = aacProvider.isWritable( "table.${table.Name}");
+ ${deleteBox} = aacProvider.isDeletable( "table.${table.Name}");
#end
}
@@ -281,14 +279,14 @@
if( context.length == 3 )
{
AuthAndConfigPages page = (AuthAndConfigPages)source.getPage( context[0] + "/AuthAndConfig" );
-
+
String roleName = (String)context[1];
String isGuiAdmin = (String)context[2];
try
{
navigationManager.beginNavigation( resources );
- page.setIsGuiAdmin( isGuiAdmin.equals("off") ? false : true );
+ page.setGuiAdmin( !"off".equals( isGuiAdmin ) );
page.setRoleName( roleName.equals(noRoleIndicator) ? null : roleName );
}
catch( Exception e )
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/GlobalAuthConfig.tml.vm 2009-09-24 11:46:49 UTC (rev 1160)
@@ -11,9 +11,8 @@
<input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
</t:parameter>
- <br />
- <br />
-
+ <t:if test="roleName"><p>${dollar}{equanda-message:authAndConfig.label.Role}${dollar}{roleName}</p></t:if>
+
<div>
<div class="t-data-grid">
<table class="t-data-grid">
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.java.vm 2009-09-24 11:46:49 UTC (rev 1160)
@@ -45,6 +45,7 @@
import org.apache.tapestry5.SelectModel;
import org.apache.tapestry5.annotations.InjectPage;
import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.equanda.client.EquandaException;
import org.equanda.client.LoginInfo;
@@ -74,25 +75,26 @@
private Object nextPage;
- private String roleName;
- public String getRoleName()
+ @Persist
+ private boolean guiAdmin;
+ public void setGuiAdmin( boolean guiAdmin )
{
- return roleName;
+ this.guiAdmin = guiAdmin;
}
- public void setRoleName( String roleName )
+ public boolean isGuiAdmin()
{
- this.roleName = roleName;
+ return guiAdmin;
}
-
+
@Persist
- private boolean isGuiAdmin;
- public boolean getIsGuiAdmin()
+ private String roleName;
+ public void setRoleName( String roleName )
{
- return this.isGuiAdmin;
+ this.roleName = roleName;
}
- public void setIsGuiAdmin( boolean isGuiAdmin )
+ public String getRoleName()
{
- this.isGuiAdmin = isGuiAdmin;
+ return roleName;
}
public SelectModel getRolesChoiceModel()
@@ -117,7 +119,7 @@
public void onActivate()
{
- setIsGuiAdmin(false);
+ guiAdmin = false;
try
{
@@ -128,7 +130,7 @@
{
if( thisRole.isGuiAdministrator() == true )
{
- setIsGuiAdmin(true);
+ guiAdmin = true;
break;
}
}
@@ -142,10 +144,10 @@
public void onSelectedFromOk()
throws EquandaException
{
- if ( getIsGuiAdmin() )
+ if ( guiAdmin )
{
navigationManager.beginNavigation( resources );
- tablePage.initPage( getRoleName(), getIsGuiAdmin() );
+ tablePage.initPage( getRoleName(), guiAdmin );
tablePage.refreshBoxes();
nextPage = tablePage;
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/SelectAuthConfig.tml.vm 2009-09-24 11:46:49 UTC (rev 1160)
@@ -5,7 +5,7 @@
<t:parameter name="title">${dollar}{equanda-message:authAndConfig.title.Roles}</t:parameter>
- <t:if test="isGuiAdmin">
+ <t:if test="isGuiAdmin()">
<p>${dollar}{equanda-message:authAndConfig.select.Role}</p>
<br/>
<select t:type="Select" t:model="RolesChoiceModel" t:value="roleName" t:blankOption="ALWAYS"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.java.vm 2009-09-24 11:46:49 UTC (rev 1160)
@@ -43,6 +43,7 @@
import org.apache.log4j.Logger;
import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
import org.apache.tapestry5.ValidationTracker;
import org.apache.tapestry5.ComponentResources;
import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
@@ -78,22 +79,27 @@
@Inject
private NavigationManager navigationManager;
- @InjectPage
- private AuthAndConfigTables tablesPage;
+ @Persist
+ @Property
+ private boolean selectCheck;
+ @Persist
+ @Property
+ private boolean actionCheck;
+
private Object nextPage;
@Persist
- private boolean isGuiAdmin;
- public void setIsGuiAdmin( boolean isGuiAdmin )
+ private boolean guiAdmin;
+ public void setGuiAdmin( boolean guiAdmin )
{
- this.isGuiAdmin = isGuiAdmin;
+ this.guiAdmin = guiAdmin;
}
- public boolean getIsGuiAdmin()
+ public boolean isGuiAdmin()
{
- return isGuiAdmin;
+ return guiAdmin;
}
-
+
@Persist
private String roleName;
public void setRoleName( String roleName )
@@ -108,7 +114,7 @@
private boolean writeAllowed;
public boolean getWriteAllowed()
{
- return getIsGuiAdmin() && (getRoleName() != null);
+ return guiAdmin && (getRoleName() != null);
}
#foreach( $page in $table.Pages )
@@ -121,29 +127,24 @@
#set ($sumBox="${page.Name}_pageSumCheck")
#set ($printBox="${page.Name}_pagePrintCheck")
@Persist
+ @Property
private boolean $readBox;
- public boolean get$readBox(){ return $readBox; }
- public void set$readBox( boolean val ){ this.$readBox = val; }
@Persist
+ @Property
private boolean $writeBox;
- public boolean get$writeBox(){ return $writeBox; }
- public void set$writeBox( boolean val ){ this.$writeBox = val; }
@Persist
+ @Property
private boolean $listBox;
- public boolean get$listBox(){ return $listBox; }
- public void set$listBox( boolean val ){ this.$listBox = val; }
@Persist
+ @Property
private boolean $sumBox;
- public boolean get$sumBox(){ return $sumBox; }
- public void set$sumBox( boolean val ){ this.$sumBox = val; }
@Persist
+ @Property
private boolean $printBox;
- public boolean get$printBox(){ return $printBox; }
- public void set$printBox( boolean val ){ this.$printBox = val; }
#foreach( $group in $page.Groups)
@@ -162,29 +163,24 @@
#set ($summaryBox="${field.Name}_sumCheck")
#set ($printBox="${field.Name}_printCheck")
@Persist
+ @Property
private boolean $readBox;
- public boolean get$readBox(){ return $readBox; }
- public void set$readBox( boolean val ){ this.$readBox = val; }
@Persist
+ @Property
private boolean $writeBox;
- public boolean get$writeBox(){ return $writeBox; }
- public void set$writeBox( boolean val ){ this.$writeBox = val; }
@Persist
+ @Property
private boolean $listBox;
- public boolean get$listBox(){ return $listBox; }
- public void set$listBox( boolean val ){ this.$listBox = val; }
@Persist
+ @Property
private boolean $summaryBox;
- public boolean get$summaryBox(){ return $summaryBox; }
- public void set$summaryBox( boolean val ){ this.$summaryBox = val; }
@Persist
+ @Property
private boolean $printBox;
- public boolean get$printBox(){ return $printBox; }
- public void set$printBox( boolean val ){ this.$printBox = val; }
#end
@@ -192,9 +188,8 @@
#foreach( $select in $table.SelectsNotHidden)
#set ($selectBox="${select.Name}_selectCheck")
@Persist
+ @Property
private boolean $selectBox;
- public boolean get$selectBox(){ return $selectBox; }
- public void set$selectBox( boolean val ){ this.$selectBox = val; }
#end
@@ -202,9 +197,8 @@
#foreach( $action in $table.Actions)
#set ($actionBox="${action.Name}_actionCheck")
@Persist
+ @Property
private boolean $actionBox;
- public boolean get$actionBox(){ return $actionBox; }
- public void set$actionBox( boolean val ){ this.$actionBox = val; }
#end
final public void onActivate()
@@ -337,8 +331,8 @@
aacProvider.setHidden( key );
}
- if( this.roleName != null ){
- LoginCache.setRoleAuths( this.roleName, aacProvider ) ;
+ if( getRoleName() != null ){
+ LoginCache.setRoleAuths( getRoleName(), aacProvider ) ;
}
else
{
@@ -357,26 +351,26 @@
#set ($listBox="${field.Name}_listCheck")
#set ($summaryBox="${field.Name}_sumCheck")
#set ($printBox="${field.Name}_printCheck")
- set${readBox}( aacProvider.isReadable( "field.${table.Name}.${field.Name}" ) );
- set${writeBox}( aacProvider.isWritable( "field.${table.Name}.${field.Name}" ) );
- set${listBox}( aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" ) );
- set${summaryBox}( aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" ) );
- set${printBox}( aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" ) );
+ ${readBox} = aacProvider.isReadable( "field.${table.Name}.${field.Name}" );
+ ${writeBox} = aacProvider.isWritable( "field.${table.Name}.${field.Name}" );
+ ${listBox} = aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" );
+ ${summaryBox} = aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" );
+ ${printBox} = aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" );
#set ($pageReadBox="${page.Name}_pageReadCheck")
#set ($pageWriteBox="${page.Name}_pageWriteCheck")
#set ($pageListBox="${page.Name}_pageListCheck")
#set ($pageSumBox="${page.Name}_pageSumCheck")
#set ($pagePrintBox="${page.Name}_pagePrintCheck")
if( aacProvider.isReadable( "field.${table.Name}.${field.Name}" ) )
- set${pageReadBox}( true );
+ ${pageReadBox} = true;
if( aacProvider.isWritable( "field.${table.Name}.${field.Name}" ) )
- set${pageWriteBox}( true );
+ ${pageWriteBox} = true;
if( aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" ) )
- set${pageListBox}( true );
+ ${pageListBox} = true;
if( aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" ) )
- set${pageSumBox}( true );
+ ${pageSumBox} = true;
if( aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" ) )
- set${pagePrintBox}( true );
+ ${pagePrintBox} = true;
#end
#foreach( $group in $page.Groups)
@@ -386,46 +380,46 @@
#set ($listBox="${field.Name}_listCheck")
#set ($summaryBox="${field.Name}_sumCheck")
#set ($printBox="${field.Name}_printCheck")
- set${readBox}( aacProvider.isReadable( "field.${table.Name}.${field.Name}" ) );
- set${writeBox}( aacProvider.isWritable( "field.${table.Name}.${field.Name}" ) );
- set${listBox}( aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" ) );
- set${summaryBox}( aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" ) );
- set${printBox}( aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" ) );
+ ${readBox} = aacProvider.isReadable( "field.${table.Name}.${field.Name}" );
+ ${writeBox} = aacProvider.isWritable( "field.${table.Name}.${field.Name}" );
+ ${listBox} = aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" );
+ ${summaryBox} = aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" );
+ ${printBox} = aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" );
#set ($groupReadBox="${group.Name}_groupReadCheck")
#set ($groupWriteBox="${group.Name}_groupWriteCheck")
#set ($groupListBox="${group.Name}_groupListCheck")
#set ($groupSumBox="${group.Name}_groupSumCheck")
#set ($groupPrintBox="${group.Name}_groupPrintCheck")
if( aacProvider.isReadable( "field.${table.Name}.${field.Name}" ) )
- set${groupReadBox}( true );
+ ${groupReadBox} = true;
if( aacProvider.isWritable( "field.${table.Name}.${field.Name}" ) )
- set${groupWriteBox}( true );
+ ${groupWriteBox} = true;
if( aacProvider.isDisplayList( "field.${table.Name}.${field.Name}" ) )
- set${groupListBox}( true );
+ ${groupListBox} = true;
if( aacProvider.isDisplaySummary( "field.${table.Name}.${field.Name}" ) )
- set${groupSumBox}( true );
+ ${groupSumBox} = true;
if( aacProvider.isDisplayPrint( "field.${table.Name}.${field.Name}" ) )
- set${groupPrintBox}( true );
+ ${groupPrintBox} = true;
#end
#end
#end
#foreach( $select in $table.SelectsNotHidden)
#set ($selectBox="${select.Name}_selectCheck")
- set${selectBox}( aacProvider.isReadable( "select.${table.Name}.${select.Name}" ) );
+ ${selectBox} = aacProvider.isReadable( "select.${table.Name}.${select.Name}" );
#end
#foreach( $action in $table.Actions)
#set ($actionBox="${action.Name}_actionCheck")
- set${actionBox}( aacProvider.isReadable( "action.${table.Name}.${action.Name}") );
+ ${actionBox} = aacProvider.isReadable( "action.${table.Name}.${action.Name}");
#end
}
private AuthAndConfigProvider getAuthsForSelection()
throws EquandaException
{
- if( tablesPage.getRoleName() != null ){
+ if( getRoleName() != null ) {
// a Role has been selected, update the boxes based on this
- return LoginCache.getRoleFromCache( tablesPage.getRoleName() );
+ return LoginCache.getRoleFromCache( getRoleName() );
}
else{
// update the boxes based on the current user
@@ -435,16 +429,16 @@
/**
* This method should be called when the rights have been set in the cache.
- * It then ensures these rights are persistant.
+ * It then ensures these rights are persisted.
*/
private void commitAuths()
throws EquandaException
{
ParsedAuthAndConfigProvider aacProvider = (ParsedAuthAndConfigProvider)getAuthsForSelection();
- if( this.roleName != null )
+ if( getRoleName() != null )
{
- EquandaRole thisRole = EquandaRole.selectRole(this.roleName);
+ EquandaRole thisRole = EquandaRole.selectRole( getRoleName() );
thisRole.setAuthAndConfig( aacProvider.getAuthAndConfigString() );
thisRole.equandaUpdate();
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-generate/src/main/velocity/t5gui/pages/TableAuthConfig.tml.vm 2009-09-24 11:46:49 UTC (rev 1160)
@@ -11,9 +11,9 @@
<input t:type="submit" value="equanda-message:button.Cancel" t:id="cancel"/>
</t:parameter>
- <br />
- <br />
+ <t:if test="roleName"><p>${dollar}{equanda-message:authAndConfig.label.Role}${dollar}{roleName}</p></t:if>
+
## Render fields
#foreach( $page in $table.Pages )
#parse( "pages/AuthAndConfigField.tml.vm" )
@@ -30,8 +30,13 @@
## Render selects
#if( !$table.SelectsNotHidden.isEmpty() )
- <fieldset>
- <legend>${dollar}{equanda-message:SelectsSection}</legend>
+ <fieldset id="pageSelects">
+ <legend>
+ ${dollar}{equanda-message:SelectsSection}
+ <input t:id="selectCheck" name="selectCheck" value="selectCheck"
+ onclick="eqHandlePageBox( selectCheck, 'pageSelects', '_selectCheck' )"
+ t:type="CheckBox"/>
+ </legend>
#foreach( $select in $table.SelectsNotHidden)
#set ($selectBox="${select.Name}_selectCheck")
<div class="nameCol">${dollar}{equanda-message:select.${table.Name}.${select.Name}}</div>
@@ -47,8 +52,13 @@
## Render actions
#if( !$table.Actions.isEmpty() )
- <fieldset>
- <legend>${dollar}{equanda-message:ActionsSection}</legend>
+ <fieldset id="pageActions">
+ <legend>
+ ${dollar}{equanda-message:ActionsSection}
+ <input t:id="actionCheck" name="actionCheck" value="actionCheck"
+ onclick="eqHandlePageBox( actionCheck, 'pageActions', '_actionCheck' )"
+ t:type="CheckBox"/>
+ </legend>
#foreach( $action in $table.Actions)
#set ($actionBox="${action.Name}_actionCheck")
<div class="nameCol">${dollar}{equanda-message:action.${table.Name}.${action.Name}}</div>
Modified: trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js
===================================================================
--- trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js 2009-09-22 15:30:16 UTC (rev 1159)
+++ trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/authandconfig.js 2009-09-24 11:46:49 UTC (rev 1160)
@@ -108,16 +108,19 @@
setFieldChecks( false, fieldSetId, inputId );
}
- // set all page checks off
- var pageWriteCheck = $$( 'fieldSet#' + fieldSetId + " input#" + pageWriteCheckStr );
- if( pageWriteCheck.length != 0 )
+ if( pageWriteCheckStr )
{
- pageWriteCheck[ 0 ].checked = false;
+ // set all page checks off
+ var pageWriteCheck = $$( 'fieldSet#' + fieldSetId + " input#" + pageWriteCheckStr );
+ if( pageWriteCheck.length != 0 )
+ {
+ pageWriteCheck[ 0 ].checked = false;
+ }
+
+ pageListCheck.checked = false;
+ pageSummaryCheck.checked = false;
+ pagePrintCheck.checked = false;
}
-
- pageListCheck.checked = false;
- pageSummaryCheck.checked = false;
- pagePrintCheck.checked = false;
}
else if( pageReadBox.checked )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|