You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(6) |
Aug
(41) |
Sep
(44) |
Oct
(31) |
Nov
(54) |
Dec
(53) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(71) |
Feb
(66) |
Mar
(65) |
Apr
(73) |
May
(68) |
Jun
(69) |
Jul
(28) |
Aug
(49) |
Sep
(44) |
Oct
(77) |
Nov
(64) |
Dec
(78) |
| 2009 |
Jan
(50) |
Feb
(28) |
Mar
(41) |
Apr
(30) |
May
(5) |
Jun
(30) |
Jul
(6) |
Aug
(2) |
Sep
(18) |
Oct
(11) |
Nov
(6) |
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(8) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tri...@us...> - 2008-01-30 08:13:58
|
Revision: 286
http://equanda.svn.sourceforge.net/equanda/?rev=286&view=rev
Author: triathlon98
Date: 2008-01-30 00:13:56 -0800 (Wed, 30 Jan 2008)
Log Message:
-----------
EQ-53 extra tests
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Compare.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Constraints.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/OverwriteDefault.java
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java
trunk/equanda-generate/src/main/resources/equanda.dtd
Added Paths:
-----------
trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DataFilterConverter.java
trunk/equanda-generate/src/test/java/org/equanda/domain/xml/CompareTest.java
trunk/equanda-generate/src/test/java/org/equanda/domain/xml/ConstraintsTest.java
trunk/equanda-generate/src/test/java/org/equanda/domain/xml/DataFilterTest.java
trunk/equanda-generate/src/test/java/org/equanda/domain/xml/OverwriteDefaultTest.java
Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Compare.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Compare.java 2008-01-29 15:23:02 UTC (rev 285)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Compare.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -45,14 +45,6 @@
@XStreamAsAttribute
private String right;
-/*<!ELEMENT compare EMPTY>
-<!ATTLIST compare
-test CDATA #REQUIRED
-value CDATA #IMPLIED
-left CDATA #IMPLIED
-right CDATA #IMPLIED>
-*/
-
@XStreamOmitField
private boolean fieldLevel;
@XStreamOmitField
Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Constraints.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Constraints.java 2008-01-29 15:23:02 UTC (rev 285)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/Constraints.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -40,8 +40,9 @@
@XStreamAlias( "constraints" )
public class Constraints
{
- // @todo unique
@XStreamConverter( ImplicitBooleanConverter.class )
+ private boolean unique;
+ @XStreamConverter( ImplicitBooleanConverter.class )
private boolean required;
@XStreamConverter( ImplicitBooleanConverter.class )
private boolean immutable;
@@ -53,12 +54,11 @@
private List<MutableEvenIf> mutableEvenIf;
@XStreamImplicit
private List<Compare> compare;
- // @todo value-when-null
- // @todo value-when-zero
+ @XStreamAlias( "value-when-null" )
+ private ValueWhenNull valueWhenNull;
+ @XStreamAlias( "value-when-zero" )
+ private ValueWhenNull valueWhenZero;
-/*<!ELEMENT constraints (unique|required|immutable|immutable-if|mutable-even-if|compare|value-when-null|value-when-zero)*>
-*/
-
public boolean isRequired()
{
return required;
@@ -83,4 +83,19 @@
{
return compare;
}
+
+ public boolean isUnique()
+ {
+ return unique;
+ }
+
+ public ValueWhenNull getValueWhenNull()
+ {
+ return valueWhenNull;
+ }
+
+ public ValueWhenNull getValueWhenZero()
+ {
+ return valueWhenZero;
+ }
}
Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java 2008-01-29 15:23:02 UTC (rev 285)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/DataFilter.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -26,6 +26,8 @@
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import org.equanda.domain.xml.aid.DataFilterConverter;
/**
* Implementation for data-filter
@@ -33,27 +35,31 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
@XStreamAlias( "data-filter" )
+@XStreamConverter( DataFilterConverter.class )
public class DataFilter
{
- @XStreamAsAttribute
private String name;
-
- @XStreamAlias( "" )
private String value;
-/*
- <!ELEMENT data-filter (#PCDATA)>
- <!ATTLIST data-filter
- name CDATA #REQUIRED>
-*/
-
public String getName()
{
return name;
}
+ public void setName( String name )
+ {
+ if ( "".equals( name ) ) name = null;
+ this.name = name;
+ }
+
public String getValue()
{
return value;
}
+
+ public void setValue( String value )
+ {
+ if ( "".equals( value ) ) value = null;
+ this.value = value;
+ }
}
Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/OverwriteDefault.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/OverwriteDefault.java 2008-01-29 15:23:02 UTC (rev 285)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/OverwriteDefault.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -35,13 +35,10 @@
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
@XStreamAlias( "overwrite-default" )
-@XStreamConverter( OverwriteDefaultConverter.class)
+@XStreamConverter( OverwriteDefaultConverter.class )
public class OverwriteDefault
{
- @XStreamAsAttribute
private String field;
-
- @XStreamAlias( "" )
private String value;
public String getField()
@@ -51,6 +48,7 @@
public void setField( String field )
{
+ if ( "".equals( field ) ) field = null;
this.field = field;
}
@@ -61,6 +59,7 @@
public void setValue( String value )
{
+ if ( "".equals( value ) ) value = null;
this.value = value;
}
}
Added: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DataFilterConverter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DataFilterConverter.java (rev 0)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/DataFilterConverter.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -0,0 +1,65 @@
+/**
+ * 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.domain.xml.aid;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import org.equanda.domain.xml.DataFilter;
+
+/**
+ * Converter for overwrite-default node.
+ *
+ * @author Joachim Van der Auwera <jo...@pr...>
+ */
+public class DataFilterConverter
+ implements Converter
+{
+ private static final String ATTRIBUTE_NAME = "name";
+
+ public void marshal( Object source, HierarchicalStreamWriter writer,
+ MarshallingContext context )
+ {
+ DataFilter value = (DataFilter) source;
+ if ( value.getName() != null ) writer.addAttribute( ATTRIBUTE_NAME, value.getName() );
+ if ( value.getValue() != null ) writer.setValue( value.getValue() );
+ }
+
+ public Object unmarshal( HierarchicalStreamReader reader,
+ UnmarshallingContext context )
+ {
+ DataFilter res = new DataFilter();
+ res.setName( reader.getAttribute( ATTRIBUTE_NAME ) );
+ res.setValue( reader.getValue() );
+ return res;
+ }
+
+ public boolean canConvert( Class type )
+ {
+ return type.equals( DataFilter.class );
+ }
+}
Modified: trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java 2008-01-29 15:23:02 UTC (rev 285)
+++ trunk/equanda-generate/src/main/java/org/equanda/domain/xml/aid/OverwriteDefaultConverter.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -45,8 +45,8 @@
MarshallingContext context )
{
OverwriteDefault value = (OverwriteDefault) source;
- writer.addAttribute( ATTRIBUTE_FIELD, value.getField() );
- writer.setValue( value.getValue() );
+ if ( value.getField() != null ) writer.addAttribute( ATTRIBUTE_FIELD, value.getField() );
+ if ( value.getValue() != null ) writer.setValue( value.getValue() );
}
public Object unmarshal( HierarchicalStreamReader reader,
Modified: trunk/equanda-generate/src/main/resources/equanda.dtd
===================================================================
--- trunk/equanda-generate/src/main/resources/equanda.dtd 2008-01-29 15:23:02 UTC (rev 285)
+++ trunk/equanda-generate/src/main/resources/equanda.dtd 2008-01-30 08:13:56 UTC (rev 286)
@@ -367,7 +367,14 @@
<!ELEMENT internal EMPTY>
<!ELEMENT link-name (#PCDATA)>
-<!ELEMENT constraints (unique|required|immutable|immutable-if|mutable-even-if|compare|value-when-null|value-when-zero)*>
+<!ELEMENT constraints (
+ (unique)?,
+ (required)?,
+ (immutable)?,
+ (immutable-if|mutable-even-if|compare)*,
+ (value-when-null)?,
+ (value-when-zero)?
+ )>
<!--
Unique fields are not allowed to be multiple, calculated, link.
Added: trunk/equanda-generate/src/test/java/org/equanda/domain/xml/CompareTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/domain/xml/CompareTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/domain/xml/CompareTest.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -0,0 +1,70 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * test for compare class
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class CompareTest
+ extends XStreamTestAdapter
+{
+ public void testParse1()
+ throws Exception
+ {
+ String test = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE equanda SYSTEM \"equanda.dtd\">\n" +
+ "\n" +
+ "<compare test=\"!=\" value=\"xx\" left=\"left\" right=\"right\"/>";
+ XStream stream = getXStreamInstance();
+ Object res = stream.fromXML( test );
+ assertTrue( res instanceof Compare );
+ Compare compare = (Compare) res;
+ assertEquals( "!=", compare.getTest() );
+ assertEquals( "xx", compare.getValue() );
+ assertEquals( "left", compare.getLeft() );
+ assertEquals( "right", compare.getRight() );
+ }
+
+ public void testParse2()
+ throws Exception
+ {
+ String test = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE equanda SYSTEM \"equanda.dtd\">\n" +
+ "\n" +
+ "<compare/>";
+ XStream stream = getXStreamInstance();
+ Object res = stream.fromXML( test );
+ assertTrue( res instanceof Compare );
+ Compare compare = (Compare) res;
+ assertNull( "!=", compare.getTest() );
+ assertNull( "xx", compare.getValue() );
+ assertNull( "left", compare.getLeft() );
+ assertNull( "right", compare.getRight() );
+ }
+}
Added: trunk/equanda-generate/src/test/java/org/equanda/domain/xml/ConstraintsTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/domain/xml/ConstraintsTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/domain/xml/ConstraintsTest.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -0,0 +1,95 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * test for constraints class
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class ConstraintsTest
+ extends XStreamTestAdapter
+{
+ public void testParse1()
+ throws Exception
+ {
+ String test = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE equanda SYSTEM \"equanda.dtd\">\n" +
+ "\n" +
+ "<constraints>" +
+ " <unique/>" +
+ " <required/>" +
+ " <immutable/>" +
+ " <immutable-if />" +
+ " <immutable-if />" +
+ " <mutable-even-if />" +
+ " <mutable-even-if />" +
+ " <compare test=\"!=\"/>" +
+ " <compare test=\">=\"/>" +
+ " <compare test=\"<=\"/>" +
+ "</constraints>";
+ XStream stream = getXStreamInstance();
+ Object res = stream.fromXML( test );
+ assertTrue( res instanceof Constraints );
+ Constraints constraints = (Constraints) res;
+ assertTrue( constraints.isUnique() );
+ assertTrue( constraints.isRequired() );
+ assertTrue( constraints.isImmutable() );
+ assertNotNull( constraints.getImmutableIf() );
+ assertEquals( 2, constraints.getImmutableIf().size() );
+ assertNotNull( constraints.getMutableEvenIf() );
+ assertEquals( 2, constraints.getMutableEvenIf().size() );
+ assertNotNull( constraints.getCompare() );
+ assertEquals( 3, constraints.getCompare().size() );
+ assertNull( constraints.getValueWhenNull() );
+ assertNull( constraints.getValueWhenZero() );
+ }
+
+ public void testParse2()
+ throws Exception
+ {
+ String test = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE equanda SYSTEM \"equanda.dtd\">\n" +
+ "\n" +
+ "<constraints>" +
+ " <value-when-null/>" +
+ " <value-when-zero/>" +
+ "</constraints>";
+ XStream stream = getXStreamInstance();
+ Object res = stream.fromXML( test );
+ assertTrue( res instanceof Constraints );
+ Constraints constraints = (Constraints) res;
+ assertFalse( constraints.isUnique() );
+ assertFalse( constraints.isRequired() );
+ assertFalse( constraints.isImmutable() );
+ assertNull( constraints.getImmutableIf() );
+ assertNull( constraints.getMutableEvenIf() );
+ assertNull( constraints.getCompare() );
+ assertNotNull( constraints.getValueWhenNull() );
+ assertNotNull( constraints.getValueWhenZero() );
+ }
+}
Added: trunk/equanda-generate/src/test/java/org/equanda/domain/xml/DataFilterTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/domain/xml/DataFilterTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/domain/xml/DataFilterTest.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -0,0 +1,66 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * test for data-filter class
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class DataFilterTest
+ extends XStreamTestAdapter
+{
+ public void testParse1()
+ throws Exception
+ {
+ String test = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE equanda SYSTEM \"equanda.dtd\">\n" +
+ "\n" +
+ "<data-filter name=\"filtername\">filter-value</data-filter>";
+ XStream stream = getXStreamInstance();
+ Object res = stream.fromXML( test );
+ assertTrue( res instanceof DataFilter );
+ DataFilter datafilter = (DataFilter) res;
+ assertEquals( "filtername", datafilter.getName() );
+ assertEquals( "filter-value", datafilter.getValue() );
+ }
+
+ public void testParse2()
+ throws Exception
+ {
+ String test = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE equanda SYSTEM \"equanda.dtd\">\n" +
+ "\n" +
+ "<data-filter/>";
+ XStream stream = getXStreamInstance();
+ Object res = stream.fromXML( test );
+ assertTrue( res instanceof DataFilter );
+ DataFilter datafilter = (DataFilter) res;
+ assertNull( datafilter.getName() );
+ assertNull( datafilter.getValue() );
+ }
+}
Added: trunk/equanda-generate/src/test/java/org/equanda/domain/xml/OverwriteDefaultTest.java
===================================================================
--- trunk/equanda-generate/src/test/java/org/equanda/domain/xml/OverwriteDefaultTest.java (rev 0)
+++ trunk/equanda-generate/src/test/java/org/equanda/domain/xml/OverwriteDefaultTest.java 2008-01-30 08:13:56 UTC (rev 286)
@@ -0,0 +1,66 @@
+/**
+ * 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.domain.xml;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * test for overwrite-default class
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ */
+public class OverwriteDefaultTest
+ extends XStreamTestAdapter
+{
+ public void testParse1()
+ throws Exception
+ {
+ String test = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE equanda SYSTEM \"equanda.dtd\">\n" +
+ "\n" +
+ "<overwrite-default field=\"xx\">value</overwrite-default>";
+ XStream stream = getXStreamInstance();
+ Object res = stream.fromXML( test );
+ assertTrue( res instanceof OverwriteDefault );
+ OverwriteDefault overwritedefault = (OverwriteDefault) res;
+ assertEquals( "value", overwritedefault.getValue() );
+ assertEquals( "xx", overwritedefault.getField() );
+ }
+
+ public void testParse2()
+ throws Exception
+ {
+ String test = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ "<!DOCTYPE equanda SYSTEM \"equanda.dtd\">\n" +
+ "\n" +
+ "<overwrite-default/>";
+ XStream stream = getXStreamInstance();
+ Object res = stream.fromXML( test );
+ assertTrue( res instanceof OverwriteDefault );
+ OverwriteDefault overwriteDefault = (OverwriteDefault) res;
+ assertNull( overwriteDefault.getValue() );
+ assertNull( overwriteDefault.getField() );
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-29 15:23:06
|
Revision: 285
http://equanda.svn.sourceforge.net/equanda/?rev=285&view=rev
Author: vladimirt
Date: 2008-01-29 07:23:02 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
changed tapestry version
Modified Paths:
--------------
t5-equanda-example/pom.xml
Modified: t5-equanda-example/pom.xml
===================================================================
--- t5-equanda-example/pom.xml 2008-01-29 15:22:10 UTC (rev 284)
+++ t5-equanda-example/pom.xml 2008-01-29 15:23:02 UTC (rev 285)
@@ -30,6 +30,11 @@
<artifactId>equanda-tapestry5</artifactId>
<version>0.9-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.equanda</groupId>
+ <artifactId>equanda-t5gui</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-29 15:22:14
|
Revision: 284
http://equanda.svn.sourceforge.net/equanda/?rev=284&view=rev
Author: vladimirt
Date: 2008-01-29 07:22:10 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
EQ-123 moved translation logic from TranslatorBean to tapestry service & added translation documentation
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java
Added Paths:
-----------
trunk/equanda-t5gui/src/site/
trunk/equanda-t5gui/src/site/site.xml
trunk/equanda-t5gui/src/site/wiki/
trunk/equanda-t5gui/src/site/wiki/index.wiki
trunk/equanda-t5gui/src/site/wiki/translation.wiki
Removed Paths:
-------------
trunk/equanda-t5gui/src/main/site/
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java 2008-01-29 15:05:51 UTC (rev 283)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java 2008-01-29 15:22:10 UTC (rev 284)
@@ -24,8 +24,11 @@
package org.equanda.t5gui.bindings;
+import java.lang.annotation.Annotation;
+
+import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.bindings.AbstractBinding;
+import org.apache.tapestry.ioc.BaseLocatable;
import org.apache.tapestry.ioc.Location;
import org.equanda.t5gui.services.EquandaMessagesSource;
@@ -34,8 +37,7 @@
*
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public class EquandaMessageBinding
- extends AbstractBinding
+public class EquandaMessageBinding extends BaseLocatable implements Binding
{
private String expression;
private ComponentResources componentResources;
@@ -49,8 +51,8 @@
* @param location location
* @param messagesSource equanda message source
*/
- public EquandaMessageBinding( ComponentResources componentResources, String expression, Location location,
- EquandaMessagesSource messagesSource )
+ public EquandaMessageBinding ( ComponentResources componentResources, String expression, Location location,
+ EquandaMessagesSource messagesSource )
{
super( location );
this.componentResources = componentResources;
@@ -67,17 +69,25 @@
return messagesSource.getMessages( componentResources ).get( key );
}
- @Override
@SuppressWarnings( "unchecked" )
public Class getBindingType()
{
return String.class;
}
- @Override
public boolean isInvariant()
{
return false;
}
+ public void set( Object value )
+ {
+ // do nothing
+ }
+
+ public <T extends Annotation> T getAnnotation( Class<T> annotationClass )
+ {
+ return null;
+ }
+
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java 2008-01-29 15:05:51 UTC (rev 283)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java 2008-01-29 15:22:10 UTC (rev 284)
@@ -24,32 +24,145 @@
package org.equanda.t5gui.services;
-import org.equanda.translations.TranslatorEJBLocal;
-import org.equanda.translations.TranslatorEJBUtil;
-
import java.util.ArrayList;
import java.util.List;
+import java.util.TreeMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.equanda.translations.Key;
+import org.equanda.translations.Parser;
+import org.equanda.translations.Translation;
+
/**
* Implementation of Message Translator
*
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public class EquandaMessagesTranslatorImpl
- implements EquandaMessagesTranslator
+public class EquandaMessagesTranslatorImpl implements EquandaMessagesTranslator
{
- /**
- * Instance of EJB translator
- */
- private TranslatorEJBLocal translator;
- public String getTranslation( String language, String strKey, String page, String[] messagesGroups )
+ private static final Log logger = LogFactory.getLog( EquandaMessagesTranslatorImpl.class );
+
+ public static String APP_TRANSLATIONS_FILE_NAME = "translations.txt";
+ public static String COMMON_TRANSLATIONS_FILE_NAME = "translations-common.txt";
+
+ private static TreeMap<String, TreeMap<Key, Translation>> translations;
+ private static String[] languages;
+
+ private enum TranslationType
{
- if ( translator == null )
+ LABEL, CAPTION, HELP
+ }
+
+ private void initTranslations()
+ {
+ if ( translations == null )
{
- translator = TranslatorEJBUtil.getLocal();
+ try
+ {
+ Parser parser = new Parser();
+ parser.parse( COMMON_TRANSLATIONS_FILE_NAME );
+ parser.parse( APP_TRANSLATIONS_FILE_NAME );
+ translations = parser.getTranslations();
+ languages = parser.getLanguages();
+ if ( languages == null || languages.length == 0 )
+ {
+ logger.warn( "Invalid translations file, languages are missing!" );
+ }
+ }
+ catch ( Exception e )
+ {
+ logger.error( e, e );
+ }
}
+ }
+ private String translate( String language, String strKey, List<String> contexts )
+ {
+ if ( strKey == null )
+ {
+ logger.warn( "Null key for translation" );
+ return null;
+ }
+ initTranslations();
+ if ( translations == null )
+ return '[' + strKey + ']';
+
+ if ( languages == null || languages.length == 0 )
+ return '[' + strKey + ']';
+
+ TranslationType type = TranslationType.LABEL;
+
+ if ( strKey.endsWith( ".label" ) )
+ {
+ strKey = strKey.substring( 0, strKey.length() - ".label".length() );
+ }
+ if ( strKey.endsWith( ".caption" ) )
+ {
+ strKey = strKey.substring( 0, strKey.length() - ".caption".length() );
+ type = TranslationType.CAPTION;
+ }
+ if ( strKey.endsWith( ".help" ) )
+ {
+ strKey = strKey.substring( 0, strKey.length() - ".help".length() );
+ type = TranslationType.HELP;
+ }
+
+ Key key = new Key();
+ key.setKey( strKey );
+
+ String languagesToTry[];
+ if ( !language.equals( languages[ 0 ] ) )
+ {
+ languagesToTry = new String[2];
+ languagesToTry[ 0 ] = language;
+ languagesToTry[ 1 ] = languages[ 0 ];
+ }
+ else
+ {
+ languagesToTry = new String[1];
+ languagesToTry[ 0 ] = language;
+ }
+
+ for ( String tlanguage : languagesToTry )
+ {
+
+ TreeMap<Key, Translation> translationsForLanguage = translations.get( tlanguage );
+ if ( translationsForLanguage == null )
+ continue;
+
+ for ( String context : contexts )
+ {
+ key.setContext( context );
+ Translation translation = translationsForLanguage.get( key );
+ if ( translation == null )
+ continue;
+ String strTranslation = null;
+ switch ( type )
+ {
+ case LABEL:
+ strTranslation = translation.getLabel();
+ break;
+
+ case CAPTION:
+ strTranslation = translation.getCaption();
+ break;
+
+ case HELP:
+ strTranslation = translation.getHelp();
+ break;
+ }
+
+ if ( strTranslation != null && strTranslation.length() > 0 )
+ return strTranslation;
+ }
+ }
+ return '[' + strKey + ']';
+ }
+
+ public String getTranslation( String language, String strKey, String page, String[] messagesGroups )
+ {
List<String> contexts = new ArrayList<String>();
contexts.add( page );
@@ -60,6 +173,6 @@
contexts.add( group );
}
}
- return translator.translate( language, strKey, contexts );
+ return translate( language, strKey, contexts );
}
}
Added: trunk/equanda-t5gui/src/site/site.xml
===================================================================
--- trunk/equanda-t5gui/src/site/site.xml (rev 0)
+++ trunk/equanda-t5gui/src/site/site.xml 2008-01-29 15:22:10 UTC (rev 284)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="equanda-t5gui">
+ <body>
+ <links>
+ <item name="equanda" href="http://www.equanda.org/"/>
+ <item name="staticwiki" href="http://www.staticwiki.org/"/>
+ </links>
+
+ <menu name="t5gui">
+ <item name="Introduction" href="index.html"/>
+ </menu>
+ </body>
+</project>
Added: trunk/equanda-t5gui/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-t5gui/src/site/wiki/index.wiki (rev 0)
+++ trunk/equanda-t5gui/src/site/wiki/index.wiki 2008-01-29 15:22:10 UTC (rev 284)
@@ -0,0 +1,26 @@
+h1. t5gui
+
+These are classes which are used to build and equanda generated tapestry5 (crud) user interface for the domain model.
+Contrary to the tapestry5 component, this is equanda specific and not intended to be used without dependencies on the rest of equanda.
+
+h2. Components
+
+h2. Services
+
+h2. Coercions
+
+- java.util.Date <-> java.sql.Date : to allow using java.sql.Date objects with the (core) components
+- java.util.Date <-> java.sql.Timestamp : to allow using java.sql.Timestamp objects with the (core) components
+- String <-> UOID
+
+h2. Translators
+
+- UoidTranslator
+
+h2 Translation support
+
+The t5gui module defines a binding which can be used to use the translations as defined in the equanda specific translations files.
+This can be accessed using the "equanda-message" binding prefix (and the key as value).
+For details see [this|translation.html] page.
+
+h2. Utility classes
\ No newline at end of file
Added: trunk/equanda-t5gui/src/site/wiki/translation.wiki
===================================================================
--- trunk/equanda-t5gui/src/site/wiki/translation.wiki (rev 0)
+++ trunk/equanda-t5gui/src/site/wiki/translation.wiki 2008-01-29 15:22:10 UTC (rev 284)
@@ -0,0 +1,41 @@
+h1. Message Translation
+
+Equanda Message Translation is intended to translate messages to user's locale.
+
+In the page and component templates it uses "equanda-message" binding to identify the message to be translated.
+
+An example of using tapestry component with "equanda-message" binding:
+{code}
+ <input t:type="TextField" t:label="equanda-message:edit.value.label" t:value="value"/>
+{code}
+
+also it can be used as simple property:
+
+{code}
+ ${equanda-message:default.error.message}
+{code}
+
+Translated messages can be used in the java code of the page or component.
+To do this you need to inject EquandaMessages interface:
+
+{code}
+ // Injecting messages
+ @Inject
+ private EquandaMessages messages;
+
+ // Using EquandaMessages to translate message
+ public String getErrorMessage(){
+ return messages.get( "error" );
+ }
+{code}
+
+Default translation dictionary in the translations-common.txt file and can be extended by creating a custom translations.txt file.
+
+Translator using contexts to find specific messages.
+Default contexts is:
+ "equanda-table",
+ "equanda-fixed",
+ "equanda-skin",
+ "equanda-exceptions",
+ "equanda-application-exceptions"
+and they can be replaced in the tapestry pages by implementing EquandaMessagesGroup interface and using getMessagesGroups() method.
\ 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: <vla...@us...> - 2008-01-29 15:05:52
|
Revision: 283
http://equanda.svn.sourceforge.net/equanda/?rev=283&view=rev
Author: vladimirt
Date: 2008-01-29 07:05:51 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
fixed compilation error
Modified Paths:
--------------
equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java
Modified: equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java
===================================================================
--- equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java 2008-01-29 13:41:04 UTC (rev 282)
+++ equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java 2008-01-29 15:05:51 UTC (rev 283)
@@ -28,7 +28,6 @@
import org.apache.tapestry.annotations.BeginRender;
import org.apache.tapestry.ioc.annotations.Inject;
-import org.equanda.t5gui.EquandaTapestryConstants;
import org.equanda.t5gui.services.EquandaMessages;
import org.equanda.t5gui.services.EquandaMessagesGroup;
import org.slf4j.Logger;
@@ -62,6 +61,12 @@
public String[] getMessagesGroups()
{
- return EquandaTapestryConstants.MESSAGE_GROUPS;
+ return new String[]{
+ "equanda-table",
+ "equanda-fixed",
+ "equanda-skin",
+ "equanda-exceptions",
+ "equanda-application-exceptions",
+ };
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-29 13:41:53
|
Revision: 282
http://equanda.svn.sourceforge.net/equanda/?rev=282&view=rev
Author: triathlon98
Date: 2008-01-29 05:41:04 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
improve default format, and assure java.sql.Date can also be used (and extremily minimal docs)
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
trunk/equanda-t5gui/src/main/site/wiki/index.wiki
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2008-01-28 17:23:17 UTC (rev 281)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2008-01-29 13:41:04 UTC (rev 282)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="DateField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
+<input t:type="DateField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}" t:format="%d.%m.%y"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2008-01-28 17:23:17 UTC (rev 281)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2008-01-29 13:41:04 UTC (rev 282)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="DateField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}" t:editTime="true" t:format="%m/%d/%y %H:%M"/>
+<input t:type="DateField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}" t:editTime="true" t:format="%d.%m.%y %H:%M"/>
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-28 17:23:17 UTC (rev 281)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-29 13:41:04 UTC (rev 282)
@@ -24,15 +24,7 @@
package org.equanda.t5gui.services;
-import java.io.IOException;
-import java.sql.Timestamp;
-import java.util.Date;
-
import javassist.runtime.Desc;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.apache.tapestry.Translator;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.MappedConfiguration;
@@ -49,6 +41,12 @@
import org.equanda.t5gui.translators.UoidTranslator;
import org.slf4j.Logger;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.Date;
+
/**
* This module is automatically included as part of the Tapestry IoC Registry, it's a good place to configure and extend
* Tapestry, or to place your own service definitions.
@@ -83,36 +81,54 @@
*/
public static void contributeTypeCoercer( Configuration<CoercionTuple> configuration )
{
- configuration.add( new CoercionTuple<String, UOID>( String.class, UOID.class, new Coercion<String, UOID>()
- {
- public UOID coerce( String input )
+ configuration.add(
+ new CoercionTuple<String, UOID>( String.class, UOID.class, new Coercion<String, UOID>()
{
- return new UOID( input );
- }
- } ) );
- configuration.add( new CoercionTuple<UOID, String>( UOID.class, String.class, new Coercion<UOID, String>()
- {
- public String coerce( UOID input )
+ public UOID coerce( String input )
+ {
+ return new UOID( input );
+ }
+ } ) );
+ configuration.add(
+ new CoercionTuple<UOID, String>( UOID.class, String.class, new Coercion<UOID, String>()
{
- return input.getId();
- }
- } ) );
- configuration.add( new CoercionTuple<Date, java.sql.Timestamp>( Date.class, Timestamp.class,
- new Coercion<Date, Timestamp>()
+ public String coerce( UOID input )
{
- public Timestamp coerce( Date input )
- {
- return new Timestamp( input.getTime() );
- }
- } ) );
- configuration.add( new CoercionTuple<Timestamp, Date>( Timestamp.class, Date.class,
- new Coercion<Timestamp, Date>()
+ return input.getId();
+ }
+ } ) );
+ configuration.add(
+ new CoercionTuple<Date, java.sql.Timestamp>( Date.class, Timestamp.class, new Coercion<Date, Timestamp>()
+ {
+ public Timestamp coerce( Date input )
{
- public Date coerce( Timestamp input )
- {
- return new Date( input.getTime() );
- }
- } ) );
+ return new Timestamp( input.getTime() );
+ }
+ } ) );
+ configuration.add(
+ new CoercionTuple<Timestamp, Date>( Timestamp.class, Date.class, new Coercion<Timestamp, Date>()
+ {
+ public Date coerce( Timestamp input )
+ {
+ return new Date( input.getTime() );
+ }
+ } ) );
+ configuration.add(
+ new CoercionTuple<Date, java.sql.Date>( Date.class, java.sql.Date.class, new Coercion<Date, java.sql.Date>()
+ {
+ public java.sql.Date coerce( Date input )
+ {
+ return new java.sql.Date( input.getTime() );
+ }
+ } ) );
+ configuration.add(
+ new CoercionTuple<java.sql.Date, Date>( java.sql.Date.class, Date.class, new Coercion<java.sql.Date, Date>()
+ {
+ public Date coerce( java.sql.Date input )
+ {
+ return new Date( input.getTime() );
+ }
+ } ) );
}
/**
Modified: trunk/equanda-t5gui/src/main/site/wiki/index.wiki
===================================================================
--- trunk/equanda-t5gui/src/main/site/wiki/index.wiki 2008-01-28 17:23:17 UTC (rev 281)
+++ trunk/equanda-t5gui/src/main/site/wiki/index.wiki 2008-01-29 13:41:04 UTC (rev 282)
@@ -1,4 +1,25 @@
h1. t5gui
These are classes which are used to build and equanda generated tapestry5 (crud) user interface for the domain model.
-Contrary to the tapestry5 component, this is equanda specific and not intended to be used without dependencies on the rest of equanda.
\ No newline at end of file
+Contrary to the tapestry5 component, this is equanda specific and not intended to be used without dependencies on the rest of equanda.
+
+h2. Components
+
+h2. Services
+
+h2. Coercions
+
+- java.util.Date <-> java.sql.Date : to allow using java.sql.Date objects with the (core) components
+- java.util.Date <-> java.sql.Timestamp : to allow using java.sql.Timestamp objects with the (core) components
+- String <-> UOID
+
+h2. Translators
+
+- UoidTranslator
+
+h2 Translation support
+
+The t5gui module defines a binding which can be used to use the translations as defined in the equanda specific translations files.
+This can be accessed using the "equanda-message" binding prefix (and the key as value).
+
+h2. Utility classes
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-28 17:23:20
|
Revision: 281
http://equanda.svn.sourceforge.net/equanda/?rev=281&view=rev
Author: triathlon98
Date: 2008-01-28 09:23:17 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
remove dependency on internal class (actually makes code slightly more efficient as well)
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/translators/UoidTranslator.java
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/translators/UoidTranslator.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/translators/UoidTranslator.java 2008-01-28 17:12:03 UTC (rev 280)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/translators/UoidTranslator.java 2008-01-28 17:23:17 UTC (rev 281)
@@ -27,7 +27,6 @@
import org.apache.tapestry.Translator;
import org.apache.tapestry.ValidationException;
import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.equanda.persistence.UOID;
public class UoidTranslator
@@ -41,14 +40,13 @@
public UOID parseClient( String clientValue, Messages messages )
throws ValidationException
{
- if ( InternalUtils.isBlank( clientValue ) )
- {
- return null;
- }
+ if ( clientValue == null || clientValue.length() == 0 ) return null;
+ clientValue = clientValue.trim();
+ if ( clientValue.length() == 0 ) return null;
try
{
- return new UOID( clientValue.trim() );
+ return new UOID( clientValue );
}
catch ( NumberFormatException ex )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-28 17:12:25
|
Revision: 280
http://equanda.svn.sourceforge.net/equanda/?rev=280&view=rev
Author: vladimirt
Date: 2008-01-28 09:12:03 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
EQ-106 - fixed time stamp format & added date to time stamp type converter
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-28 17:11:57 UTC (rev 279)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-28 17:12:03 UTC (rev 280)
@@ -24,7 +24,15 @@
package org.equanda.t5gui.services;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.Date;
+
import javassist.runtime.Desc;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
import org.apache.tapestry.Translator;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.MappedConfiguration;
@@ -41,10 +49,6 @@
import org.equanda.t5gui.translators.UoidTranslator;
import org.slf4j.Logger;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-
/**
* This module is automatically included as part of the Tapestry IoC Registry, it's a good place to configure and extend
* Tapestry, or to place your own service definitions.
@@ -93,6 +97,22 @@
return input.getId();
}
} ) );
+ configuration.add( new CoercionTuple<Date, java.sql.Timestamp>( Date.class, Timestamp.class,
+ new Coercion<Date, Timestamp>()
+ {
+ public Timestamp coerce( Date input )
+ {
+ return new Timestamp( input.getTime() );
+ }
+ } ) );
+ configuration.add( new CoercionTuple<Timestamp, Date>( Timestamp.class, Date.class,
+ new Coercion<Timestamp, Date>()
+ {
+ public Date coerce( Timestamp input )
+ {
+ return new Date( input.getTime() );
+ }
+ } ) );
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-28 17:12:02
|
Revision: 279
http://equanda.svn.sourceforge.net/equanda/?rev=279&view=rev
Author: vladimirt
Date: 2008-01-28 09:11:57 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
EQ-106 - fixed time stamp format & added date to time stamp type converter
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2008-01-28 17:11:57 UTC (rev 279)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="DateField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}" t:editTime="true"/>
+<input t:type="DateField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}" t:editTime="true" t:format="%m/%d/%y %H:%M"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-28 16:51:28
|
Revision: 278
http://equanda.svn.sourceforge.net/equanda/?rev=278&view=rev
Author: triathlon98
Date: 2008-01-28 08:51:26 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
EQ-123 assure default contexts are used and use translated labels in generated ui
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/boolean.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/int.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java
Removed Paths:
-------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaTapestryConstants.java
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/boolean.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/boolean.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/boolean.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="CheckBox" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
+<input t:type="CheckBox" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/date.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="DateField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
+<input t:type="DateField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/double.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="TextField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
+<input t:type="TextField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/int.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/int.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/int.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="TextField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
+<input t:type="TextField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,2 +1,2 @@
<t:label t:for="${field.VarName}"/>
-<input t:type="$engine.lowerFirst("${field.JavaFieldType}")/LinkList" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.VarName}"/>
+<input t:type="$engine.lowerFirst("${field.JavaFieldType}")/LinkList" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.VarName}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,2 +1,2 @@
<t:label t:for="${field.VarName}"/>
-<input t:type="$engine.lowerFirst("${field.JavaFieldType}")/LinkOne" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.VarName}" t:setter="${field.Name}Setter"/>
+<input t:type="$engine.lowerFirst("${field.JavaFieldType}")/LinkOne" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.VarName}" t:setter="${field.Name}Setter"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/pages.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -21,19 +21,19 @@
<t:parameter name="title$pageindex">Metadata</t:parameter>
<t:parameter name="content$pageindex">
<t:label for="uoid"/>
- <input t:type="TextField" t:label="EquandaId" t:id="uoid" t:value="value.UOID" size="14" disabled="true"/>
+ <input t:type="TextField" t:label="equanda-message:field.${table.Name}.EquandaId" t:id="uoid" t:value="value.UOID" size="14" disabled="true"/>
<br/>
<t:label for="equandaCreationDate"/>
- <input t:type="TextField" t:label="EquandaCreationDate" t:id="equandaCreationDate" t:value="value.EquandaCreationDate" size="20" disabled="true"/>
+ <input t:type="TextField" t:label="equanda-message:field.${table.Name}.EquandaCreationDate" t:id="equandaCreationDate" t:value="value.EquandaCreationDate" size="20" disabled="true"/>
<br/>
<t:label for="equandaModificationDate"/>
- <input t:type="TextField" t:label="EquandaModificationDate" t:id="equandaModificationDate" t:value="value.EquandaModificationDate" size="20" disabled="true"/>
+ <input t:type="TextField" t:label="equanda-message:field.${table.Name}.EquandaModificationDate" t:id="equandaModificationDate" t:value="value.EquandaModificationDate" size="20" disabled="true"/>
<br/>
<t:label for="equandaVersion"/>
- <input t:type="TextField" t:label="EquandaVersion" t:id="equandaVersion" t:value="value.EquandaVersion" size="6" disabled="true"/>
+ <input t:type="TextField" t:label="equanda-message:field.${table.Name}.EquandaVersion" t:id="equandaVersion" t:value="value.EquandaVersion" size="6" disabled="true"/>
<br/>
<t:label for="equandaStatus"/>
- <input t:type="TextField" t:label="EquandaStatus" t:id="equandaStatus" t:value="value.EquandaStatus" size="2" disabled="true"/>
+ <input t:type="TextField" t:label="equanda-message:field.${table.Name}.EquandaStatus" t:id="equandaStatus" t:value="value.EquandaStatus" size="2" disabled="true"/>
<br/>
</t:parameter>
</span>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/string.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="TextField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
+<input t:type="TextField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="DateField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}" t:editTime="true"/>
+<input t:type="DateField" t:label="equanda-message:field.${table.Name}.${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}" t:editTime="true"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm 2008-01-28 16:51:26 UTC (rev 278)
@@ -13,7 +13,7 @@
#if( $table.Types.size() > 1 )
<div class="${table.Name}-EquandaType ${table.Name}-type-">
<t:label for="equandaType"/>
- <input class="${table.Name}-type-Selector" t:type="Select" t:label="EquandaType" t:id="equandaType" t:value="value.EquandaType" t:disabled="isTypeKnown()" model="TypeModel" encoder="TypeEncoder" onchange="$(('Show-${table.Name}-type-'+this.options[this.selectedIndex].value).trim()).onclick();"/>
+ <input class="${table.Name}-type-Selector" t:type="Select" t:label="equanda-message:field.${table.Name}.EquandaType" t:id="equandaType" t:value="value.EquandaType" t:disabled="isTypeKnown()" model="TypeModel" encoder="TypeEncoder" onchange="$(('Show-${table.Name}-type-'+this.options[this.selectedIndex].value).trim()).onclick();"/>
<br/>
</div>
#end
Deleted: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaTapestryConstants.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaTapestryConstants.java 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaTapestryConstants.java 2008-01-28 16:51:26 UTC (rev 278)
@@ -1,14 +0,0 @@
-package org.equanda.t5gui;
-
-/**
- * Tapestry Constants
- *
- * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
- */
-public class EquandaTapestryConstants
-{
- public static final String EQUANDA_MESSAGE_BINDING_PREFIX = "equanda-message";
-
- public static final String[] MESSAGE_GROUPS = { "equanda-table", "equanda-fixed", "equanda-skin",
- "equanda-exceptions", "equanda-application-exceptions", "ReportList" };
-}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-28 16:51:26 UTC (rev 278)
@@ -37,7 +37,6 @@
import org.equanda.persistence.SelectorsState;
import org.equanda.persistence.SelectorsStateType;
import org.equanda.persistence.UOID;
-import org.equanda.t5gui.EquandaTapestryConstants;
import org.equanda.t5gui.bindings.EquandaMessageBindingFactory;
import org.equanda.t5gui.translators.UoidTranslator;
import org.slf4j.Logger;
@@ -202,14 +201,11 @@
*
* @param configuration configuration to add to
* @param messagesSource Equanda Message Source
- * @param equandaMessageTranslator Equanda Message Translator
*/
public static void contributeBindingSource( MappedConfiguration<String, BindingFactory> configuration,
- EquandaMessagesSource messagesSource,
- EquandaMessagesTranslator equandaMessageTranslator )
+ EquandaMessagesSource messagesSource )
{
- configuration.add( EquandaTapestryConstants.EQUANDA_MESSAGE_BINDING_PREFIX, new EquandaMessageBindingFactory(
- messagesSource ) );
+ configuration.add( "equanda-message", new EquandaMessageBindingFactory( messagesSource ) );
}
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java 2008-01-28 16:19:16 UTC (rev 277)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java 2008-01-28 16:51:26 UTC (rev 278)
@@ -34,6 +34,13 @@
public class EquandaMessagesSourceImpl
implements EquandaMessagesSource
{
+ private static final String[] DEFAULT_GROUPS = {
+ "equanda-table",
+ "equanda-fixed",
+ "equanda-skin",
+ "equanda-exceptions",
+ "equanda-application-exceptions",
+ };
private EquandaMessagesTranslator equandaMessageTranslator;
@@ -57,6 +64,10 @@
{
messages.setMessagesGroups( ( (EquandaMessagesGroup) componentResources.getPage() ).getMessagesGroups() );
}
+ else
+ {
+ messages.setMessagesGroups( DEFAULT_GROUPS );
+ }
return messages;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-28 16:19:23
|
Revision: 277
http://equanda.svn.sourceforge.net/equanda/?rev=277&view=rev
Author: vladimirt
Date: 2008-01-28 08:19:16 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
EQ-123 - fixed import package path
Modified Paths:
--------------
equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java
Modified: equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java
===================================================================
--- equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java 2008-01-28 15:16:20 UTC (rev 276)
+++ equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java 2008-01-28 16:19:16 UTC (rev 277)
@@ -28,8 +28,8 @@
import org.apache.tapestry.annotations.BeginRender;
import org.apache.tapestry.ioc.annotations.Inject;
-import org.equanda.t5gui.EquandaMessages;
import org.equanda.t5gui.EquandaTapestryConstants;
+import org.equanda.t5gui.services.EquandaMessages;
import org.equanda.t5gui.services.EquandaMessagesGroup;
import org.slf4j.Logger;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-28 15:16:22
|
Revision: 276
http://equanda.svn.sourceforge.net/equanda/?rev=276&view=rev
Author: triathlon98
Date: 2008-01-28 07:16:20 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
EQ-123 fix code style and assure project header is there
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java 2008-01-28 15:11:13 UTC (rev 275)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java 2008-01-28 15:16:20 UTC (rev 276)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.bindings;
import org.apache.tapestry.ComponentResources;
@@ -7,10 +31,11 @@
/**
* Equanda Message Binding
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public class EquandaMessageBinding extends AbstractBinding
+public class EquandaMessageBinding
+ extends AbstractBinding
{
private String expression;
private ComponentResources componentResources;
@@ -18,18 +43,14 @@
/**
* Creates Equanda Message Binding
- *
- * @param componentResources
- * component resources
- * @param expression
- * message expression
- * @param location
- * location
- * @param messagesSource
- * equanda message source
+ *
+ * @param componentResources component resources
+ * @param expression message expression
+ * @param location location
+ * @param messagesSource equanda message source
*/
- public EquandaMessageBinding ( ComponentResources componentResources, String expression, Location location,
- EquandaMessagesSource messagesSource )
+ public EquandaMessageBinding( ComponentResources componentResources, String expression, Location location,
+ EquandaMessagesSource messagesSource )
{
super( location );
this.componentResources = componentResources;
@@ -43,8 +64,7 @@
public Object get()
{
String key = expression != null ? expression.trim() : expression;
- String value = messagesSource.getMessages( componentResources ).get( key );
- return value;
+ return messagesSource.getMessages( componentResources ).get( key );
}
@Override
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java 2008-01-28 15:11:13 UTC (rev 275)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java 2008-01-28 15:16:20 UTC (rev 276)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.bindings;
import org.apache.tapestry.Binding;
@@ -8,43 +32,37 @@
/**
* Factory for Equanda Message Binding
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public class EquandaMessageBindingFactory implements BindingFactory
+public class EquandaMessageBindingFactory
+ implements BindingFactory
{
private EquandaMessagesSource messagesSource;
/**
* Creates Equanda Message Binding Factory
- *
- * @param messagesSource
- * equanda message source
+ *
+ * @param messagesSource equanda message source
*/
- public EquandaMessageBindingFactory ( EquandaMessagesSource messagesSource )
+ public EquandaMessageBindingFactory( EquandaMessagesSource messagesSource )
{
this.messagesSource = messagesSource;
}
/**
* Creates new Equanda Message Binding
- *
- * @param description
- * of the binding
- * @param container
- * the component, as represented by its resources, for which a
- * binding is to be created.
- * @param component
- * the component whose parameter is to be bound by the resulting
- * binding (rarely used)
+ *
+ * @param description of the binding
+ * @param container the component, as represented by its resources, for which a binding is to be created.
+ * @param componentResources the component whose parameter is to be bound by the resulting binding (rarely used)
* @param expression
- * @param location
- * from which the binding was generate, or null if not known
+ * @param location from which the binding was generate, or null if not known
* @return the new equanda message binding instance
*/
public Binding newBinding( String description, ComponentResources container, ComponentResources componentResources,
- String expression, Location location )
+ String expression, Location location )
{
return new EquandaMessageBinding( componentResources, expression, location, messagesSource );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-28 15:11:17
|
Revision: 275
http://equanda.svn.sourceforge.net/equanda/?rev=275&view=rev
Author: triathlon98
Date: 2008-01-28 07:11:13 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
EQ-123 fix code style and assure project header is there
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesGroup.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -24,13 +24,7 @@
package org.equanda.t5gui.services;
-import java.io.IOException;
-
import javassist.runtime.Desc;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.apache.tapestry.Translator;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.MappedConfiguration;
@@ -48,6 +42,10 @@
import org.equanda.t5gui.translators.UoidTranslator;
import org.slf4j.Logger;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
/**
* This module is automatically included as part of the Tapestry IoC Registry, it's a good place to configure and extend
* Tapestry, or to place your own service definitions.
@@ -129,7 +127,8 @@
HttpSession session = servletRequest.getSession();
if ( session.getAttribute( SESSION_SELECTORSSTATE ) != null )
{
- SelectorsState.setSelectorsState( (SelectorsStateType)session.getAttribute( SESSION_SELECTORSSTATE ));
+ SelectorsState.setSelectorsState(
+ (SelectorsStateType) session.getAttribute( SESSION_SELECTORSSTATE ) );
}
try
@@ -167,9 +166,8 @@
/**
* Building Equanda Messages Source
- *
- * @param equandaMessageTranslator
- * Equanda Message Translator
+ *
+ * @param equandaMessageTranslator Equanda Message Translator
* @return new Messages Source
*/
public static EquandaMessagesSource build( EquandaMessagesTranslator equandaMessageTranslator )
@@ -181,7 +179,7 @@
/**
* Building Equanda Message Translator
- *
+ *
* @return new Message Translator
*/
public static EquandaMessagesTranslator build()
@@ -191,30 +189,27 @@
/**
* Contributes the injection providers
- *
- * @param configuration
- * configuration
+ *
+ * @param configuration configuration
*/
public static void contributeInjectionProvider( OrderedConfiguration<InjectionProvider> configuration )
{
- configuration.add( "EqundaMessages", new EquandaMessagesInjectionProvider() );
+ configuration.add( "EquandaMessages", new EquandaMessagesInjectionProvider() );
}
/**
* Contributes the factory for equanda binding prefixes
- *
- * @param configuration
- * configuration to add to
- * @param messagesSource
- * Equanda Message Source
- * @param equandaMessageTranslator
- * Equanda Message Translator
+ *
+ * @param configuration configuration to add to
+ * @param messagesSource Equanda Message Source
+ * @param equandaMessageTranslator Equanda Message Translator
*/
public static void contributeBindingSource( MappedConfiguration<String, BindingFactory> configuration,
- EquandaMessagesSource messagesSource, EquandaMessagesTranslator equandaMessageTranslator )
+ EquandaMessagesSource messagesSource,
+ EquandaMessagesTranslator equandaMessageTranslator )
{
configuration.add( EquandaTapestryConstants.EQUANDA_MESSAGE_BINDING_PREFIX, new EquandaMessageBindingFactory(
- messagesSource ) );
+ messagesSource ) );
}
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.services;
import org.apache.tapestry.ioc.Messages;
@@ -4,33 +28,31 @@
/**
* Provides access to translated message catalog
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public interface EquandaMessages extends Messages
+public interface EquandaMessages
+ extends Messages
{
/**
* Sets language for translation
- *
- * @param language
- * language
+ *
+ * @param language language
*/
public void setLanguage( String language );
/**
* Sets page name
- *
- * @param page
- * page name
+ *
+ * @param page page name
*/
public void setPage( String page );
/**
* Sets message groups
- *
- * @param messagesGroups
- * message groups
+ *
+ * @param messagesGroups message groups
*/
public void setMessagesGroups( String[] messagesGroups );
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesGroup.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesGroup.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesGroup.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.services;
/**
@@ -2,3 +26,3 @@
* Group contexts for Equanda base pages
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
@@ -9,7 +33,7 @@
{
/**
* Gets message groups
- *
+ *
* @return array of the message groups
*/
public String[] getMessagesGroups();
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.services;
import org.apache.tapestry.ioc.MessageFormatter;
@@ -4,10 +28,11 @@
/**
* Equanda Message implementation
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public class EquandaMessagesImpl implements EquandaMessages
+public class EquandaMessagesImpl
+ implements EquandaMessages
{
private String language;
private String page;
@@ -16,11 +41,10 @@
/**
* Creates Equanda Messages
- *
- * @param equandaMessageTranslator
- * equanda message translator
+ *
+ * @param equandaMessageTranslator equanda message translator
*/
- public EquandaMessagesImpl ( EquandaMessagesTranslator equandaMessageTranslator )
+ public EquandaMessagesImpl( EquandaMessagesTranslator equandaMessageTranslator )
{
this.equandaMessageTranslator = equandaMessageTranslator;
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.services;
import org.apache.tapestry.ioc.ObjectLocator;
@@ -8,26 +32,27 @@
/**
* Performs injection of translated messages
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public class EquandaMessagesInjectionProvider implements InjectionProvider
+public class EquandaMessagesInjectionProvider
+ implements InjectionProvider
{
@SuppressWarnings( "unchecked" )
public boolean provideInjection( String fieldName, Class fieldType, ObjectLocator locator,
- ClassTransformation transformation, MutableComponentModel componentModel )
+ ClassTransformation transformation, MutableComponentModel componentModel )
{
if ( fieldType.equals( EquandaMessages.class ) )
{
- // String resourcesField = transformation.getResourcesFieldName();
String msgSourceField = transformation.addInjectedField( EquandaMessagesSource.class,
- "equandaMessageSource", locator.getService( EquandaMessagesSource.class ) );
+ "equandaMessagesSource",
+ locator.getService(
+ EquandaMessagesSource.class ) );
String body = String.format( "%s = %s.%s( %s );", fieldName, msgSourceField, "getMessages", transformation
- .getResourcesFieldName() );
+ .getResourcesFieldName() );
transformation.makeReadOnly( fieldName );
- // transformation.extendConstructor( body );
transformation.extendMethod( TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE, body );
return true;
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.services;
import org.apache.tapestry.ComponentResources;
@@ -4,7 +28,7 @@
/**
* Message source for translation
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
public interface EquandaMessagesSource
@@ -12,9 +36,8 @@
/**
* Gets equanda messages for specified component
- *
- * @param componentResources
- * component resources
+ *
+ * @param componentResources component resources
* @return messages
*/
public EquandaMessages getMessages( ComponentResources componentResources );
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.services;
import org.apache.tapestry.ComponentResources;
@@ -4,21 +28,21 @@
/**
* Equanda Message Source implementation
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public class EquandaMessagesSourceImpl implements EquandaMessagesSource
+public class EquandaMessagesSourceImpl
+ implements EquandaMessagesSource
{
private EquandaMessagesTranslator equandaMessageTranslator;
/**
* Creates message source
- *
- * @param equandaMessageTranslator
- * message translator
+ *
+ * @param equandaMessageTranslator message translator
*/
- public EquandaMessagesSourceImpl ( EquandaMessagesTranslator equandaMessageTranslator )
+ public EquandaMessagesSourceImpl( EquandaMessagesTranslator equandaMessageTranslator )
{
this.equandaMessageTranslator = equandaMessageTranslator;
}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -1,3 +1,27 @@
+/**
+ * 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.t5gui.services;
/**
@@ -2,3 +26,3 @@
* Message Translator
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
@@ -9,15 +33,11 @@
{
/**
* Gets translation for specified key
- *
- * @param language
- * language
- * @param strKey
- * message key
- * @param page
- * page name
- * @param messagesGroups
- * array of message groups
+ *
+ * @param language language
+ * @param strKey message key
+ * @param page page name
+ * @param messagesGroups array of message groups
* @return translated message
*/
public String getTranslation( String language, String strKey, String page, String[] messagesGroups );
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java 2008-01-28 14:37:07 UTC (rev 274)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java 2008-01-28 15:11:13 UTC (rev 275)
@@ -1,17 +1,42 @@
+/**
+ * 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.t5gui.services;
+import org.equanda.translations.TranslatorEJBLocal;
+import org.equanda.translations.TranslatorEJBUtil;
+
import java.util.ArrayList;
import java.util.List;
-import org.equanda.translations.TranslatorEJBLocal;
-import org.equanda.translations.TranslatorEJBUtil;
-
/**
* Implementation of Message Translator
- *
+ *
* @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
*/
-public class EquandaMessagesTranslatorImpl implements EquandaMessagesTranslator
+public class EquandaMessagesTranslatorImpl
+ implements EquandaMessagesTranslator
{
/**
* Instance of EJB translator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-28 14:37:11
|
Revision: 274
http://equanda.svn.sourceforge.net/equanda/?rev=274&view=rev
Author: triathlon98
Date: 2008-01-28 06:37:07 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
EQ-122 assure hidden when only one without taking up screen estate
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm 2008-01-28 13:48:31 UTC (rev 273)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm 2008-01-28 14:37:07 UTC (rev 274)
@@ -1,6 +1,4 @@
-<div class="${table.Name}-EquandaType ${table.Name}-type-">
- <t:label for="equandaType"/>
- <div style="display:none;">
+<div style="display:none;">
#foreach( $type in $table.Types )
<a href="javascript:;" id="Show-${table.Name}-type-${type.TrimmedType}" onclick="
#foreach( $st in $type.Included )
@@ -11,9 +9,11 @@
#end
">${type.TrimmedType}</a>
#end##foreach types
- </div>
-#if( $table.Types.size() > 0 )
+</div>
+#if( $table.Types.size() > 1 )
+<div class="${table.Name}-EquandaType ${table.Name}-type-">
+ <t:label for="equandaType"/>
<input class="${table.Name}-type-Selector" t:type="Select" t:label="EquandaType" t:id="equandaType" t:value="value.EquandaType" t:disabled="isTypeKnown()" model="TypeModel" encoder="TypeEncoder" onchange="$(('Show-${table.Name}-type-'+this.options[this.selectedIndex].value).trim()).onclick();"/>
-#end
<br/>
</div>
+#end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-28 13:48:36
|
Revision: 273
http://equanda.svn.sourceforge.net/equanda/?rev=273&view=rev
Author: triathlon98
Date: 2008-01-28 05:48:31 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
move file to better location
Added Paths:
-----------
trunk/equanda-client/src/main/resources/translations-common.txt
Removed Paths:
-------------
trunk/equanda-t4-template/src/main/webapp/translations-common.txt
trunk/equanda-t5gui/src/main/resources/translations-common.txt
Copied: trunk/equanda-client/src/main/resources/translations-common.txt (from rev 271, trunk/equanda-t5gui/src/main/resources/translations-common.txt)
===================================================================
--- trunk/equanda-client/src/main/resources/translations-common.txt (rev 0)
+++ trunk/equanda-client/src/main/resources/translations-common.txt 2008-01-28 13:48:31 UTC (rev 273)
@@ -0,0 +1,925 @@
+;Last edited: 2007-06-03
+.languages en;nl;ro;fr
+.key 90000/equanda-exceptions
+.label.en Persistence exception
+.label.nl Persistence probleem
+.label.ro Exceptie de persistenta
+.label.fr Problème de persistance
+.key 90001/equanda-exceptions
+.label.en Can't create session facade
+.label.nl Kan sessie façade niet aanmaken
+.label.ro Nu se poate crea obiectul
+.label.fr Peut pas creér façade de session
+.key 90002/equanda-exceptions
+.label.en Object not found
+.label.nl Object niet gevonden
+.label.ro Obiectul nu a fost gasit
+.label.fr Objet non trouvé
+.key 90003/equanda-exceptions
+.label.en Failed to update value
+.label.nl Update van waarde is mislukt
+.label.ro Valuarea nu a fost modificata
+.label.fr Rafraishir valeur non reusit
+.key 90004/equanda-exceptions
+.label.en Trying to update object with UOID==null
+.label.nl Poging tot update object met uoid null
+.label.ro Incercare de a modifica un obiect care are UOID-ul null
+.label.fr Essai de rafraishir un objet avec uoid null
+.key 90005/equanda-exceptions
+.label.en Can't create lazycollection
+.label.nl Kan collectie niet aanmaken
+.label.ro Nu se poate crea colectia intermediara
+.label.fr Creation collection non reusit
+.key 90006/equanda-exceptions
+.label.en Cannot delete as there are references to this record
+.label.nl Kan gegevens niet verwijderen aangezien er nog verwijzingen naar bestaan
+.label.ro Verificare esuata pt Cascade-keep
+.label.fr Données ne peuvent pas être effacé si il-y a encore des références active
+.key 90007/equanda-exceptions
+.label.en Null UOID is not allowed
+.label.nl UOID is null
+.label.ro UOID-ul nu are voie sa fie gol sau null
+.label.fr UOID est null
+.key 90008/equanda-exceptions
+.label.en UOID $1 not found for an object of type $2
+.label.nl UOID $1 niet gevonden voor $2 object
+.label.ro UOID-ul $1 nu a fost gasit pentru un obiect de tipul $2
+.label.fr UOID $1 non trouvé pour un objet $2
+.key 90009/equanda-exceptions
+.label.en Cannot set auto field $$1
+.label.nl Kan auto veld $$2 niet zetten
+.label.ro Nu se poate seta un camp auto $$1
+.label.fr Problème avec champs automatique $$2
+.key 90010/equanda-exceptions
+.label.en Cannot remove proxy when not saved
+.label.nl Kan proxy niet verwijderen als niet opgeslagen
+.label.ro Nu se poate sterge un proxy care nu a fost salvat
+.label.fr Proxy non-sauvegardé ne peut pas être effacé
+.key 90011/equanda-exceptions
+.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 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 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 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 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 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 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 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 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 Kies
+.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 masterDetail.button.cancel/MasterDetailPage
+.label.en Cancel
+.caption.en Cancel
+.label.nl Annuleer
+.caption.nl Annuleer
+.label.ro Anulare
+.caption.ro Anulare
+.label.fr Supprimer
+.caption.fr Supprimer
+.key masterDetail.button.cancel.accesskey/MasterDetailPage
+.label.en E
+.label.nl W
+.label.ro E
+.label.fr A
+.key masterDetail.button.create/MasterDetailPage
+.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 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
Deleted: trunk/equanda-t4-template/src/main/webapp/translations-common.txt
===================================================================
--- trunk/equanda-t4-template/src/main/webapp/translations-common.txt 2008-01-28 13:34:22 UTC (rev 272)
+++ trunk/equanda-t4-template/src/main/webapp/translations-common.txt 2008-01-28 13:48:31 UTC (rev 273)
@@ -1,925 +0,0 @@
-;Last edited: 2007-06-03
-.languages en;nl;ro;fr
-.key 90000/equanda-exceptions
-.label.en Persistence exception
-.label.nl Persistence probleem
-.label.ro Exceptie de persistenta
-.label.fr Problème de persistance
-.key 90001/equanda-exceptions
-.label.en Can't create session facade
-.label.nl Kan sessie façade niet aanmaken
-.label.ro Nu se poate crea obiectul
-.label.fr Peut pas creér façade de session
-.key 90002/equanda-exceptions
-.label.en Object not found
-.label.nl Object niet gevonden
-.label.ro Obiectul nu a fost gasit
-.label.fr Objet non trouvé
-.key 90003/equanda-exceptions
-.label.en Failed to update value
-.label.nl Update van waarde is mislukt
-.label.ro Valuarea nu a fost modificata
-.label.fr Rafraishir valeur non reusit
-.key 90004/equanda-exceptions
-.label.en Trying to update object with UOID==null
-.label.nl Poging tot update object met uoid null
-.label.ro Incercare de a modifica un obiect care are UOID-ul null
-.label.fr Essai de rafraishir un objet avec uoid null
-.key 90005/equanda-exceptions
-.label.en Can't create lazycollection
-.label.nl Kan collectie niet aanmaken
-.label.ro Nu se poate crea colectia intermediara
-.label.fr Creation collection non reusit
-.key 90006/equanda-exceptions
-.label.en Cannot delete as there are references to this record
-.label.nl Kan gegevens niet verwijderen aangezien er nog verwijzingen naar bestaan
-.label.ro Verificare esuata pt Cascade-keep
-.label.fr Données ne peuvent pas être effacé si il-y a encore des références active
-.key 90007/equanda-exceptions
-.label.en Null UOID is not allowed
-.label.nl UOID is null
-.label.ro UOID-ul nu are voie sa fie gol sau null
-.label.fr UOID est null
-.key 90008/equanda-exceptions
-.label.en UOID $1 not found for an object of type $2
-.label.nl UOID $1 niet gevonden voor $2 object
-.label.ro UOID-ul $1 nu a fost gasit pentru un obiect de tipul $2
-.label.fr UOID $1 non trouvé pour un objet $2
-.key 90009/equanda-exceptions
-.label.en Cannot set auto field $$1
-.label.nl Kan auto veld $$2 niet zetten
-.label.ro Nu se poate seta un camp auto $$1
-.label.fr Problème avec champs automatique $$2
-.key 90010/equanda-exceptions
-.label.en Cannot remove proxy when not saved
-.label.nl Kan proxy niet verwijderen als niet opgeslagen
-.label.ro Nu se poate sterge un proxy care nu a fost salvat
-.label.fr Proxy non-sauvegardé ne peut pas être effacé
-.key 90011/equanda-exceptions
-.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 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 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 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 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 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 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 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 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 Kies
-.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 masterDetail.button.cancel/MasterDetailPage
-.label.en Cancel
-.caption.en Cancel
-.label.nl Annuleer
-.caption.nl Annuleer
-.label.ro Anulare
-.caption.ro Anulare
-.label.fr Supprimer
-.caption.fr Supprimer
-.key masterDetail.button.cancel.accesskey/MasterDetailPage
-.label.en E
-.label.nl W
-.label.ro E
-.label.fr A
-.key masterDetail.button.create/MasterDetailPage
-.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 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
Deleted: trunk/equanda-t5gui/src/main/resources/translations-common.txt
===================================================================
--- trunk/equanda-t5gui/src/main/resources/translations-common.txt 2008-01-28 13:34:22 UTC (rev 272)
+++ trunk/equanda-t5gui/src/main/resources/translations-common.txt 2008-01-28 13:48:31 UTC (rev 273)
@@ -1,925 +0,0 @@
-;Last edited: 2007-06-03
-.languages en;nl;ro;fr
-.key 90000/equanda-exceptions
-.label.en Persistence exception
-.label.nl Persistence probleem
-.label.ro Exceptie de persistenta
-.label.fr Problème de persistance
-.key 90001/equanda-exceptions
-.label.en Can't create session facade
-.label.nl Kan sessie façade niet aanmaken
-.label.ro Nu se poate crea obiectul
-.label.fr Peut pas creér façade de session
-.key 90002/equanda-exceptions
-.label.en Object not found
-.label.nl Object niet gevonden
-.label.ro Obiectul nu a fost gasit
-.label.fr Objet non trouvé
-.key 90003/equanda-exceptions
-.label.en Failed to update value
-.label.nl Update van waarde is mislukt
-.label.ro Valuarea nu a fost modificata
-.label.fr Rafraishir valeur non reusit
-.key 90004/equanda-exceptions
-.label.en Trying to update object with UOID==null
-.label.nl Poging tot update object met uoid null
-.label.ro Incercare de a modifica un obiect care are UOID-ul null
-.label.fr Essai de rafraishir un objet avec uoid null
-.key 90005/equanda-exceptions
-.label.en Can't create lazycollection
-.label.nl Kan collectie niet aanmaken
-.label.ro Nu se poate crea colectia intermediara
-.label.fr Creation collection non reusit
-.key 90006/equanda-exceptions
-.label.en Cannot delete as there are references to this record
-.label.nl Kan gegevens niet verwijderen aangezien er nog verwijzingen naar bestaan
-.label.ro Verificare esuata pt Cascade-keep
-.label.fr Données ne peuvent pas être effacé si il-y a encore des références active
-.key 90007/equanda-exceptions
-.label.en Null UOID is not allowed
-.label.nl UOID is null
-.label.ro UOID-ul nu are voie sa fie gol sau null
-.label.fr UOID est null
-.key 90008/equanda-exceptions
-.label.en UOID $1 not found for an object of type $2
-.label.nl UOID $1 niet gevonden voor $2 object
-.label.ro UOID-ul $1 nu a fost gasit pentru un obiect de tipul $2
-.label.fr UOID $1 non trouvé pour un objet $2
-.key 90009/equanda-exceptions
-.label.en Cannot set auto field $$1
-.label.nl Kan auto veld $$2 niet zetten
-.label.ro Nu se poate seta un camp auto $$1
-.label.fr Problème avec champs automatique $$2
-.key 90010/equanda-exceptions
-.label.en Cannot remove proxy when not saved
-.label.nl Kan proxy niet verwijderen als niet opgeslagen
-.label.ro Nu se poate sterge un proxy care nu a fost salvat
-.label.fr Proxy non-sauvegardé ne peut pas être effacé
-.key 90011/equanda-exceptions
-.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 $...
[truncated message content] |
|
From: <tri...@us...> - 2008-01-28 13:34:23
|
Revision: 272
http://equanda.svn.sourceforge.net/equanda/?rev=272&view=rev
Author: triathlon98
Date: 2008-01-28 05:34:22 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
assure delete icon is available in a global place
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
Added Paths:
-----------
trunk/equanda-t5gui/src/main/resources/org/
trunk/equanda-t5gui/src/main/resources/org/equanda/
trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/
trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/delete.png
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2008-01-28 13:07:57 UTC (rev 271)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.tml.vm 2008-01-28 13:34:22 UTC (rev 272)
@@ -2,7 +2,7 @@
<t:loop source="value" value="current" index="index">
<div class="equandaLinkListRow">
- <t:actionlink t:id="Delete" context="index" class="equandalinkOpacity"><img src="${dollar}{asset:context:images/delete.png}" /></t:actionlink> <t:${engine.lowerFirst("${table.Name}")}.Display object="current"/>
+ <t:actionlink t:id="Delete" context="index" class="equandalinkOpacity"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" /></t:actionlink> <t:${engine.lowerFirst("${table.Name}")}.Display object="current"/>
</div>
</t:loop>
<t:actionlink t:id="Add">Add</t:actionlink>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2008-01-28 13:07:57 UTC (rev 271)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.tml.vm 2008-01-28 13:34:22 UTC (rev 272)
@@ -2,8 +2,7 @@
<div class="equandaLinkOne">
- <!-- <t:actionlink t:id="Delete">(y)</t:actionlink> <t:actionlink t:id="Select">Select</t:actionlink> -->
- <t:actionlink t:id="Delete" class="equandalinkOpacity"><img src="${dollar}{asset:context:images/delete.png}" /></t:actionlink> <t:actionlink t:id="Select">Select</t:actionlink>
+ <t:actionlink t:id="Delete" class="equandalinkOpacity"><img src="${dollar}{asset:classpath:org/equanda/t5gui/delete.png}" /></t:actionlink> <t:actionlink t:id="Select">Select</t:actionlink>
<t:if test="hasValue()"><t:${engine.lowerFirst("${table.Name}")}.Display object="value"/></t:if>
</div>
Added: trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/delete.png
===================================================================
(Binary files differ)
Property changes on: trunk/equanda-t5gui/src/main/resources/org/equanda/t5gui/delete.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-28 13:08:08
|
Revision: 271
http://equanda.svn.sourceforge.net/equanda/?rev=271&view=rev
Author: triathlon98
Date: 2008-01-28 05:07:57 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
add hashcode
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/translations/Key.java
Modified: trunk/equanda-client/src/main/java/org/equanda/translations/Key.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/translations/Key.java 2008-01-28 10:34:00 UTC (rev 270)
+++ trunk/equanda-client/src/main/java/org/equanda/translations/Key.java 2008-01-28 13:07:57 UTC (rev 271)
@@ -100,4 +100,9 @@
}
return ret;
}
+
+ public int hashCode()
+ {
+ return ( ( key != null ) ? key.hashCode() : 0 ) + ( ( ( context != null ) ? context.hashCode() : 0 ) * 7 );
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-28 10:43:20
|
Revision: 270
http://equanda.svn.sourceforge.net/equanda/?rev=270&view=rev
Author: triathlon98
Date: 2008-01-28 02:34:00 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
documentation
Modified Paths:
--------------
trunk/equanda-generate/src/site/site.xml
trunk/equanda-generate/src/site/wiki/index.wiki
trunk/equanda-generate/src/site/wiki/templates/ejb3.wiki
Modified: trunk/equanda-generate/src/site/site.xml
===================================================================
--- trunk/equanda-generate/src/site/site.xml 2008-01-26 22:05:32 UTC (rev 269)
+++ trunk/equanda-generate/src/site/site.xml 2008-01-28 10:34:00 UTC (rev 270)
@@ -9,5 +9,14 @@
<menu name="generate">
<item name="Introduction" href="index.html"/>
</menu>
+
+ <menu name="templates">
+ <item name="ejb3" href="templates/ejb3.html"/>
+ <item name="t5gui" href="templates/t5gui.html"/>
+ <item name="login" href="templates/login.html"/>
+ <item name="import" href="templates/import.html"/>
+ <item name="ddltool" href="templates/ddltool.html"/>
+ <item name="docs" href="templates/docs.html"/>
+ </menu>
</body>
</project>
Modified: trunk/equanda-generate/src/site/wiki/index.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/index.wiki 2008-01-26 22:05:32 UTC (rev 269)
+++ trunk/equanda-generate/src/site/wiki/index.wiki 2008-01-28 10:34:00 UTC (rev 270)
@@ -3,9 +3,9 @@
This model handled the code generation based on the domain model.
Templates are provided for the following aspects.
-- [ejb3|ejb3.wiki] : EJB3 persistence layer
-- [t5gui|t5gui.html] : tapestry5 user interface
-- [login|login.html] : user management support
-- [import|import.html] : import data
-- [ddltool|ddltool.html] : ddltool
-- [docs|docs.html] : domain model documentation
+- [ejb3|templates/ejb3.html] : EJB3 persistence layer
+- [t5gui|templates/t5gui.html] : tapestry5 user interface
+- [login|templates/login.html] : user management support
+- [import|templates/import.html] : import data
+- [ddltool|templates/ddltool.html] : ddltool
+- [docs|templates/docs.html] : domain model documentation
Modified: trunk/equanda-generate/src/site/wiki/templates/ejb3.wiki
===================================================================
--- trunk/equanda-generate/src/site/wiki/templates/ejb3.wiki 2008-01-26 22:05:32 UTC (rev 269)
+++ trunk/equanda-generate/src/site/wiki/templates/ejb3.wiki 2008-01-28 10:34:00 UTC (rev 270)
@@ -11,6 +11,7 @@
- field values can be limited (choices) either statically (xml description) or programmatically (validation)
- for removing records cascade-delete, cascade-keep (don't delete when there are references to the record) or normal null all references behaviour can be used
- field templates can be used
+- custom filtering and sorting on defined selectors
Implementation
- powerful proxies are used which make objects available remotely. Similar to detached objects, but completely transparent (no need to instantiate)
@@ -19,3 +20,75 @@
- filters and sort orders can be defined on the selectors
As a bonus, when your client only uses the proxies, it is straightforward to replace the backend (this way the data could for example be based on webservices instead of EJB3 entity beans).
+
+
+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.
+
+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.
+
+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.
+
+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 results in the following classes. The classes you are most likely to use/need are indicated in bold. Where a name contains "Object" this should be replaced with the table name.
+
+Global
+- LazyEJBList.java : lazy list with beans, generated to allow package private access to some methods.
+- LazyProxyList.java : lazy list with proxies, generated to allow package private access to some methods.
+- ObjectUpdater.java : used internally for updating the proxies.
+- *EquandaGlobal.java* : utility class which allows getting instance of the beans, and some extra utility methods including access to the base selector EJBQL qeries.
+
+For each root table
+- ObjectSelectorBean.java : stateless session bean, allows access to the selectors
+- ObjectBean.java : stateful session bean, providing access to the entity bean with all the constraints checking through the mediators
+- DMNameBean.java : ejb3 entity bean
+- *ObjectSelectorEJB.java* : selector bean interface
+- *ObjectEJB.java* : (remote) interface for the ObjectBean
+- ObjectEJBLocal.java : local interface for the ObjectBean
+- *Object* : the proxy
+- ObjectState.java : the proxy state, use internally in the proxy to allow updating without replacing the actual proxy
+- ObjectMediatorRoot : root of the mediator object tree,
+- ObjectConstants : contains the constants like type identifiers and possibe values for choice fields
+- ObjectSelectorHelperBase : base for the ObjectSelectorHelper
+- *ObjectSelectorHelper* : allows code to be inserted for the builders.
+- DMObjectSelector : class for handling selections at the entity bean level
+- ObjectBase : shared interface between ObjectEJB and ObjectEJBLocal
+
+For each table
+- ObjectMediatorBase : contains the programmatic constraints
+- *ObjectMediator* : empty file, should be used for programmatic constraints and defining the actions
+- *ObjectType* : type handling and testing
+- *ObjectTypeChoice* : validator to possible types
+
+For each multiple field
+- DMObject_FieldBean : entity bean which represents the multiple field values
+
+{private}
+
+[multiple-field]
+
+// build entity bean
+output1=${outputDir}${packageDir}server/pm/DM${table}_${field}Bean.java
+template1=DMFieldBean.java.vm
+{private}
+
+They are generated in three different packages, of which you define the prefix using the following settings in "dm.ini".
+{code}
+[ejb3]
+package=org.equanda.test.dm
+
+[extra]
+ejb-package=org.equanda.test.dm
+{code}
+Note that both settings should be equals or you will get compilation problems.
+
+- /prefix/.client : contains all the classes which may be required for remote access to the data.
+- /prefix/.server : contains the classes which should only be available inside the application server. The client does not need access to these.
+- /prefix/.server/dm : separate package for the ejb3 entity beans (which are server-side only).
+
+
+h2. Customizing the generated domain model
+
+...
\ 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: <vla...@us...> - 2008-01-26 22:05:33
|
Revision: 269
http://equanda.svn.sourceforge.net/equanda/?rev=269&view=rev
Author: vladimirt
Date: 2008-01-26 14:05:32 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
added example of equanda message translate
Modified Paths:
--------------
equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java
Modified: equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java
===================================================================
--- equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java 2008-01-26 21:54:55 UTC (rev 268)
+++ equanda-example/example-gui/src/main/java/myapp/example/gui/pages/Start.java 2008-01-26 22:05:32 UTC (rev 269)
@@ -26,13 +26,42 @@
import java.util.Date;
+import org.apache.tapestry.annotations.BeginRender;
+import org.apache.tapestry.ioc.annotations.Inject;
+import org.equanda.t5gui.EquandaMessages;
+import org.equanda.t5gui.EquandaTapestryConstants;
+import org.equanda.t5gui.services.EquandaMessagesGroup;
+import org.slf4j.Logger;
+
/**
* Start page of application ca-t5gui.
*/
-public class Start
+public class Start implements EquandaMessagesGroup
{
+
+ @Inject
+ private EquandaMessages messages1;
+
+ @Inject
+ private EquandaMessages messages2;
+
+ @Inject
+ private Logger logger;
+
+ @BeginRender
+ public void beginRender()
+ {
+ logger.info( "Value for key Add-Continue from messages1 is: " + messages1.get( "Add-Continue" ) );
+ logger.info( "Value for key Add-Continue from messages2 is: " + messages2.get( "Add-Continue" ) );
+ }
+
public Date getCurrentTime()
{
return new Date();
}
+
+ public String[] getMessagesGroups()
+ {
+ return EquandaTapestryConstants.MESSAGE_GROUPS;
+ }
}
\ 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: <vla...@us...> - 2008-01-26 21:54:57
|
Revision: 268
http://equanda.svn.sourceforge.net/equanda/?rev=268&view=rev
Author: vladimirt
Date: 2008-01-26 13:54:55 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
EQ-106 added time to date picker
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2008-01-26 21:52:47 UTC (rev 267)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/timestamp.tml.vm 2008-01-26 21:54:55 UTC (rev 268)
@@ -1,2 +1,2 @@
<t:label for="${field.VarName}"/>
-<input t:type="DateField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}"/>
+<input t:type="DateField" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.Name}" t:editTime="true"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-26 21:52:52
|
Revision: 267
http://equanda.svn.sourceforge.net/equanda/?rev=267&view=rev
Author: vladimirt
Date: 2008-01-26 13:52:47 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
EQ-122 hide type info if there are no subtypes
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm 2008-01-26 21:48:16 UTC (rev 266)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/type.tml.vm 2008-01-26 21:52:47 UTC (rev 267)
@@ -12,6 +12,8 @@
">${type.TrimmedType}</a>
#end##foreach types
</div>
+#if( $table.Types.size() > 0 )
<input class="${table.Name}-type-Selector" t:type="Select" t:label="EquandaType" t:id="equandaType" t:value="value.EquandaType" t:disabled="isTypeKnown()" model="TypeModel" encoder="TypeEncoder" onchange="$(('Show-${table.Name}-type-'+this.options[this.selectedIndex].value).trim()).onclick();"/>
+#end
<br/>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-26 21:48:17
|
Revision: 266
http://equanda.svn.sourceforge.net/equanda/?rev=266&view=rev
Author: vladimirt
Date: 2008-01-26 13:48:16 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
changed tapestry version from 5.0.7 to 5.0.8
Modified Paths:
--------------
equanda-example/pom.xml
Modified: equanda-example/pom.xml
===================================================================
--- equanda-example/pom.xml 2008-01-26 21:47:41 UTC (rev 265)
+++ equanda-example/pom.xml 2008-01-26 21:48:16 UTC (rev 266)
@@ -364,6 +364,6 @@
<properties>
<equanda-version>0.9-SNAPSHOT</equanda-version>
<staticwiki-version>0.9-SNAPSHOT</staticwiki-version>
- <tapestry-version>5.0.7-SNAPSHOT</tapestry-version>
+ <tapestry-version>5.0.8-SNAPSHOT</tapestry-version>
</properties>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-26 21:47:43
|
Revision: 265
http://equanda.svn.sourceforge.net/equanda/?rev=265&view=rev
Author: vladimirt
Date: 2008-01-26 13:47:41 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
changed tapestry version from 5.0.7 to 5.0.8
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-01-26 21:46:02 UTC (rev 264)
+++ trunk/pom.xml 2008-01-26 21:47:41 UTC (rev 265)
@@ -528,7 +528,7 @@
</profiles>
<properties>
- <tapestry-release-version>5.0.7-SNAPSHOT</tapestry-release-version>
+ <tapestry-release-version>5.0.8-SNAPSHOT</tapestry-release-version>
<staticwiki-release-version>0.9-SNAPSHOT</staticwiki-release-version>
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-26 21:46:05
|
Revision: 264
http://equanda.svn.sourceforge.net/equanda/?rev=264&view=rev
Author: vladimirt
Date: 2008-01-26 13:46:02 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
removed unused class
Removed Paths:
-------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/pages/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vla...@us...> - 2008-01-26 21:30:23
|
Revision: 263
http://equanda.svn.sourceforge.net/equanda/?rev=263&view=rev
Author: vladimirt
Date: 2008-01-26 13:30:17 -0800 (Sat, 26 Jan 2008)
Log Message:
-----------
EQ-123 - added message translation
Modified Paths:
--------------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
Added Paths:
-----------
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaTapestryConstants.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/pages/
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/pages/EquandaBasePage.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesGroup.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java
trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java
trunk/equanda-t5gui/src/main/resources/
trunk/equanda-t5gui/src/main/resources/translations-common.txt
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaTapestryConstants.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaTapestryConstants.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/EquandaTapestryConstants.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,14 @@
+package org.equanda.t5gui;
+
+/**
+ * Tapestry Constants
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class EquandaTapestryConstants
+{
+ public static final String EQUANDA_MESSAGE_BINDING_PREFIX = "equanda-message";
+
+ public static final String[] MESSAGE_GROUPS = { "equanda-table", "equanda-fixed", "equanda-skin",
+ "equanda-exceptions", "equanda-application-exceptions", "ReportList" };
+}
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBinding.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,63 @@
+package org.equanda.t5gui.bindings;
+
+import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry.internal.bindings.AbstractBinding;
+import org.apache.tapestry.ioc.Location;
+import org.equanda.t5gui.services.EquandaMessagesSource;
+
+/**
+ * Equanda Message Binding
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class EquandaMessageBinding extends AbstractBinding
+{
+ private String expression;
+ private ComponentResources componentResources;
+ private EquandaMessagesSource messagesSource;
+
+ /**
+ * Creates Equanda Message Binding
+ *
+ * @param componentResources
+ * component resources
+ * @param expression
+ * message expression
+ * @param location
+ * location
+ * @param messagesSource
+ * equanda message source
+ */
+ public EquandaMessageBinding ( ComponentResources componentResources, String expression, Location location,
+ EquandaMessagesSource messagesSource )
+ {
+ super( location );
+ this.componentResources = componentResources;
+ this.expression = expression;
+ this.messagesSource = messagesSource;
+ }
+
+ /**
+ * Gets translated message
+ */
+ public Object get()
+ {
+ String key = expression != null ? expression.trim() : expression;
+ String value = messagesSource.getMessages( componentResources ).get( key );
+ return value;
+ }
+
+ @Override
+ @SuppressWarnings( "unchecked" )
+ public Class getBindingType()
+ {
+ return String.class;
+ }
+
+ @Override
+ public boolean isInvariant()
+ {
+ return false;
+ }
+
+}
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/bindings/EquandaMessageBindingFactory.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,52 @@
+package org.equanda.t5gui.bindings;
+
+import org.apache.tapestry.Binding;
+import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.services.BindingFactory;
+import org.equanda.t5gui.services.EquandaMessagesSource;
+
+/**
+ * Factory for Equanda Message Binding
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class EquandaMessageBindingFactory implements BindingFactory
+{
+
+ private EquandaMessagesSource messagesSource;
+
+ /**
+ * Creates Equanda Message Binding Factory
+ *
+ * @param messagesSource
+ * equanda message source
+ */
+ public EquandaMessageBindingFactory ( EquandaMessagesSource messagesSource )
+ {
+ this.messagesSource = messagesSource;
+ }
+
+ /**
+ * Creates new Equanda Message Binding
+ *
+ * @param description
+ * of the binding
+ * @param container
+ * the component, as represented by its resources, for which a
+ * binding is to be created.
+ * @param component
+ * the component whose parameter is to be bound by the resulting
+ * binding (rarely used)
+ * @param expression
+ * @param location
+ * from which the binding was generate, or null if not known
+ * @return the new equanda message binding instance
+ */
+ public Binding newBinding( String description, ComponentResources container, ComponentResources componentResources,
+ String expression, Location location )
+ {
+ return new EquandaMessageBinding( componentResources, expression, location, messagesSource );
+ }
+
+}
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/pages/EquandaBasePage.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/pages/EquandaBasePage.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/pages/EquandaBasePage.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,17 @@
+package org.equanda.t5gui.pages;
+
+import org.equanda.t5gui.EquandaTapestryConstants;
+import org.equanda.t5gui.services.EquandaMessagesGroup;
+
+/**
+ * Base Equanda Tapestry page
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class EquandaBasePage implements EquandaMessagesGroup
+{
+
+ public String[] getMessagesGroups()
+ {
+ return EquandaTapestryConstants.MESSAGE_GROUPS;
+ }
+}
Modified: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-24 23:33:14 UTC (rev 262)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/AppModule.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -24,7 +24,13 @@
package org.equanda.t5gui.services;
+import java.io.IOException;
+
import javassist.runtime.Desc;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
import org.apache.tapestry.Translator;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.MappedConfiguration;
@@ -37,13 +43,11 @@
import org.equanda.persistence.SelectorsState;
import org.equanda.persistence.SelectorsStateType;
import org.equanda.persistence.UOID;
+import org.equanda.t5gui.EquandaTapestryConstants;
+import org.equanda.t5gui.bindings.EquandaMessageBindingFactory;
import org.equanda.t5gui.translators.UoidTranslator;
import org.slf4j.Logger;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-
/**
* This module is automatically included as part of the Tapestry IoC Registry, it's a good place to configure and extend
* Tapestry, or to place your own service definitions.
@@ -161,4 +165,56 @@
configuration.add( "SelectorsState", selectorsStateFilter );
}
+ /**
+ * Building Equanda Messages Source
+ *
+ * @param equandaMessageTranslator
+ * Equanda Message Translator
+ * @return new Messages Source
+ */
+ public static EquandaMessagesSource build( EquandaMessagesTranslator equandaMessageTranslator )
+ {
+ EquandaMessagesSource service = new EquandaMessagesSourceImpl( equandaMessageTranslator );
+
+ return service;
+ }
+
+ /**
+ * Building Equanda Message Translator
+ *
+ * @return new Message Translator
+ */
+ public static EquandaMessagesTranslator build()
+ {
+ return new EquandaMessagesTranslatorImpl();
+ }
+
+ /**
+ * Contributes the injection providers
+ *
+ * @param configuration
+ * configuration
+ */
+ public static void contributeInjectionProvider( OrderedConfiguration<InjectionProvider> configuration )
+ {
+ configuration.add( "EqundaMessages", new EquandaMessagesInjectionProvider() );
+ }
+
+ /**
+ * Contributes the factory for equanda binding prefixes
+ *
+ * @param configuration
+ * configuration to add to
+ * @param messagesSource
+ * Equanda Message Source
+ * @param equandaMessageTranslator
+ * Equanda Message Translator
+ */
+ public static void contributeBindingSource( MappedConfiguration<String, BindingFactory> configuration,
+ EquandaMessagesSource messagesSource, EquandaMessagesTranslator equandaMessageTranslator )
+ {
+ configuration.add( EquandaTapestryConstants.EQUANDA_MESSAGE_BINDING_PREFIX, new EquandaMessageBindingFactory(
+ messagesSource ) );
+ }
+
}
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessages.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,37 @@
+package org.equanda.t5gui.services;
+
+import org.apache.tapestry.ioc.Messages;
+
+/**
+ * Provides access to translated message catalog
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public interface EquandaMessages extends Messages
+{
+
+ /**
+ * Sets language for translation
+ *
+ * @param language
+ * language
+ */
+ public void setLanguage( String language );
+
+ /**
+ * Sets page name
+ *
+ * @param page
+ * page name
+ */
+ public void setPage( String page );
+
+ /**
+ * Sets message groups
+ *
+ * @param messagesGroups
+ * message groups
+ */
+ public void setMessagesGroups( String[] messagesGroups );
+
+}
\ No newline at end of file
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesGroup.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesGroup.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesGroup.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,16 @@
+package org.equanda.t5gui.services;
+
+/**
+ * Group contexts for Equanda base pages
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public interface EquandaMessagesGroup
+{
+ /**
+ * Gets message groups
+ *
+ * @return array of the message groups
+ */
+ public String[] getMessagesGroups();
+}
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesImpl.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,78 @@
+package org.equanda.t5gui.services;
+
+import org.apache.tapestry.ioc.MessageFormatter;
+
+/**
+ * Equanda Message implementation
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class EquandaMessagesImpl implements EquandaMessages
+{
+ private String language;
+ private String page;
+ private EquandaMessagesTranslator equandaMessageTranslator;
+ private String[] messagesGroups;
+
+ /**
+ * Creates Equanda Messages
+ *
+ * @param equandaMessageTranslator
+ * equanda message translator
+ */
+ public EquandaMessagesImpl ( EquandaMessagesTranslator equandaMessageTranslator )
+ {
+ this.equandaMessageTranslator = equandaMessageTranslator;
+ }
+
+ /**
+ * Returns true if the translation bundle contains the named key
+ */
+ public boolean contains( String key )
+ {
+ return get( key ) != null;
+ }
+
+ /**
+ * Returns translated message for the key
+ */
+ public String format( String key, Object... args )
+ {
+ return get( key );
+ }
+
+ /**
+ * Returns translated message for the key
+ */
+ public String get( String key )
+ {
+ return equandaMessageTranslator.getTranslation( language, key, page, messagesGroups );
+ }
+
+ public MessageFormatter getFormatter( final String key )
+ {
+ return new MessageFormatter()
+ {
+
+ public String format( Object... args )
+ {
+ return String.format( key, args );
+ }
+ };
+ }
+
+ public void setLanguage( String language )
+ {
+ this.language = language;
+ }
+
+ public void setPage( String page )
+ {
+ this.page = page;
+ }
+
+ public void setMessagesGroups( String[] messagesGroups )
+ {
+ this.messagesGroups = messagesGroups;
+ }
+}
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesInjectionProvider.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,37 @@
+package org.equanda.t5gui.services;
+
+import org.apache.tapestry.ioc.ObjectLocator;
+import org.apache.tapestry.model.MutableComponentModel;
+import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry.services.InjectionProvider;
+import org.apache.tapestry.services.TransformConstants;
+
+/**
+ * Performs injection of translated messages
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class EquandaMessagesInjectionProvider implements InjectionProvider
+{
+
+ @SuppressWarnings( "unchecked" )
+ public boolean provideInjection( String fieldName, Class fieldType, ObjectLocator locator,
+ ClassTransformation transformation, MutableComponentModel componentModel )
+ {
+
+ if ( fieldType.equals( EquandaMessages.class ) )
+ {
+ // String resourcesField = transformation.getResourcesFieldName();
+ String msgSourceField = transformation.addInjectedField( EquandaMessagesSource.class,
+ "equandaMessageSource", locator.getService( EquandaMessagesSource.class ) );
+ String body = String.format( "%s = %s.%s( %s );", fieldName, msgSourceField, "getMessages", transformation
+ .getResourcesFieldName() );
+ transformation.makeReadOnly( fieldName );
+ // transformation.extendConstructor( body );
+ transformation.extendMethod( TransformConstants.CONTAINING_PAGE_DID_LOAD_SIGNATURE, body );
+ return true;
+ }
+ return false;
+ }
+
+}
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSource.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,22 @@
+package org.equanda.t5gui.services;
+
+import org.apache.tapestry.ComponentResources;
+
+/**
+ * Message source for translation
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public interface EquandaMessagesSource
+{
+
+ /**
+ * Gets equanda messages for specified component
+ *
+ * @param componentResources
+ * component resources
+ * @return messages
+ */
+ public EquandaMessages getMessages( ComponentResources componentResources );
+
+}
\ No newline at end of file
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesSourceImpl.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,40 @@
+package org.equanda.t5gui.services;
+
+import org.apache.tapestry.ComponentResources;
+
+/**
+ * Equanda Message Source implementation
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class EquandaMessagesSourceImpl implements EquandaMessagesSource
+{
+
+ private EquandaMessagesTranslator equandaMessageTranslator;
+
+ /**
+ * Creates message source
+ *
+ * @param equandaMessageTranslator
+ * message translator
+ */
+ public EquandaMessagesSourceImpl ( EquandaMessagesTranslator equandaMessageTranslator )
+ {
+ this.equandaMessageTranslator = equandaMessageTranslator;
+ }
+
+ public EquandaMessages getMessages( ComponentResources componentResources )
+ {
+ EquandaMessages messages = new EquandaMessagesImpl( equandaMessageTranslator );
+ messages.setLanguage( componentResources.getLocale().getLanguage() );
+ messages.setPage( componentResources.getPageName() );
+
+ if ( componentResources.getPage() instanceof EquandaMessagesGroup )
+ {
+ messages.setMessagesGroups( ( (EquandaMessagesGroup) componentResources.getPage() ).getMessagesGroups() );
+ }
+
+ return messages;
+ }
+
+}
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslator.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,24 @@
+package org.equanda.t5gui.services;
+
+/**
+ * Message Translator
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public interface EquandaMessagesTranslator
+{
+ /**
+ * Gets translation for specified key
+ *
+ * @param language
+ * language
+ * @param strKey
+ * message key
+ * @param page
+ * page name
+ * @param messagesGroups
+ * array of message groups
+ * @return translated message
+ */
+ public String getTranslation( String language, String strKey, String page, String[] messagesGroups );
+}
\ No newline at end of file
Added: trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java
===================================================================
--- trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java (rev 0)
+++ trunk/equanda-t5gui/src/main/java/org/equanda/t5gui/services/EquandaMessagesTranslatorImpl.java 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,40 @@
+package org.equanda.t5gui.services;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.equanda.translations.TranslatorEJBLocal;
+import org.equanda.translations.TranslatorEJBUtil;
+
+/**
+ * Implementation of Message Translator
+ *
+ * @author <a href="mailto:vla...@gm...">Vladimir Tkachenko</a>
+ */
+public class EquandaMessagesTranslatorImpl implements EquandaMessagesTranslator
+{
+ /**
+ * Instance of EJB translator
+ */
+ private TranslatorEJBLocal translator;
+
+ public String getTranslation( String language, String strKey, String page, String[] messagesGroups )
+ {
+ if ( translator == null )
+ {
+ translator = TranslatorEJBUtil.getLocal();
+ }
+
+ List<String> contexts = new ArrayList<String>();
+ contexts.add( page );
+
+ if ( messagesGroups != null )
+ {
+ for ( String group : messagesGroups )
+ {
+ contexts.add( group );
+ }
+ }
+ return translator.translate( language, strKey, contexts );
+ }
+}
Added: trunk/equanda-t5gui/src/main/resources/translations-common.txt
===================================================================
--- trunk/equanda-t5gui/src/main/resources/translations-common.txt (rev 0)
+++ trunk/equanda-t5gui/src/main/resources/translations-common.txt 2008-01-26 21:30:17 UTC (rev 263)
@@ -0,0 +1,925 @@
+;Last edited: 2007-06-03
+.languages en;nl;ro;fr
+.key 90000/equanda-exceptions
+.label.en Persistence exception
+.label.nl Persistence probleem
+.label.ro Exceptie de persistenta
+.label.fr Problème de persistance
+.key 90001/equanda-exceptions
+.label.en Can't create session facade
+.label.nl Kan sessie façade niet aanmaken
+.label.ro Nu se poate crea obiectul
+.label.fr Peut pas creér façade de session
+.key 90002/equanda-exceptions
+.label.en Object not found
+.label.nl Object niet gevonden
+.label.ro Obiectul nu a fost gasit
+.label.fr Objet non trouvé
+.key 90003/equanda-exceptions
+.label.en Failed to update value
+.label.nl Update van waarde is mislukt
+.label.ro Valuarea nu a fost modificata
+.label.fr Rafraishir valeur non reusit
+.key 90004/equanda-exceptions
+.label.en Trying to update object with UOID==null
+.label.nl Poging tot update object met uoid null
+.label.ro Incercare de a modifica un obiect care are UOID-ul null
+.label.fr Essai de rafraishir un objet avec uoid null
+.key 90005/equanda-exceptions
+.label.en Can't create lazycollection
+.label.nl Kan collectie niet aanmaken
+.label.ro Nu se poate crea colectia intermediara
+.label.fr Creation collection non reusit
+.key 90006/equanda-exceptions
+.label.en Cannot delete as there are references to this record
+.label.nl Kan gegevens niet verwijderen aangezien er nog verwijzingen naar bestaan
+.label.ro Verificare esuata pt Cascade-keep
+.label.fr Données ne peuvent pas être effacé si il-y a encore des références active
+.key 90007/equanda-exceptions
+.label.en Null UOID is not allowed
+.label.nl UOID is null
+.label.ro UOID-ul nu are voie sa fie gol sau null
+.label.fr UOID est null
+.key 90008/equanda-exceptions
+.label.en UOID $1 not found for an object of type $2
+.label.nl UOID $1 niet gevonden voor $2 object
+.label.ro UOID-ul $1 nu a fost gasit pentru un obiect de tipul $2
+.label.fr UOID $1 non trouvé pour un objet $2
+.key 90009/equanda-exceptions
+.label.en Cannot set auto field $$1
+.label.nl Kan auto veld $$2 niet zetten
+.label.ro Nu se poate seta un camp auto $$1
+.label.fr Problème avec champs automatique $$2
+.key 90010/equanda-exceptions
+.label.en Cannot remove proxy when not saved
+.label.nl Kan proxy niet verwijderen als niet opgeslagen
+.label.ro Nu se poate sterge un proxy care nu a fost salvat
+.label.fr Proxy non-sauvegardé ne peut pas être effacé
+.key 90011/equanda-exceptions
+.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 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 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 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 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 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 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 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 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 Kies
+.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 masterDetail.button.cancel/MasterDetailPage
+.label.en Cancel
+.caption.en Cancel
+.label.nl Annuleer
+.caption.nl Annuleer
+.label.ro Anulare
+.caption.ro Anulare
+.label.fr Supprimer
+.caption.fr Supprimer
+.key masterDetail.button.cancel.accesskey/MasterDetailPage
+.label.en E
+.label.nl W
+.label.ro E
+.label.fr A
+.key masterDetail.button.create/MasterDetailPage
+.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 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2008-01-24 23:33:21
|
Revision: 262
http://equanda.svn.sourceforge.net/equanda/?rev=262&view=rev
Author: triathlon98
Date: 2008-01-24 15:33:14 -0800 (Thu, 24 Jan 2008)
Log Message:
-----------
EQ-124 assuer LinkOne and LinkList components are t5 Fields
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2008-01-21 21:20:49 UTC (rev 261)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkList.java.vm 2008-01-24 23:33:14 UTC (rev 262)
@@ -40,6 +40,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.annotations.InjectPage;
import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.corelib.base.AbstractField;
import org.apache.tapestry.ioc.annotations.Inject;
import org.equanda.persistence.UOID;
@@ -49,6 +50,7 @@
* Component for a multiple link to this object
*/
public class LinkList
+ extends AbstractField
{
@Parameter( required = true )
private List<${table.Name}> value;
@@ -104,4 +106,9 @@
value.remove( index );
return null;
}
+
+ protected void processSubmission( String s )
+ {
+ // nothing to do, I think
+ }
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2008-01-21 21:20:49 UTC (rev 261)
+++ trunk/equanda-generate/src/main/velocity/t5gui/components/LinkOne.java.vm 2008-01-24 23:33:14 UTC (rev 262)
@@ -40,12 +40,14 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.annotations.InjectPage;
import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.corelib.base.AbstractField;
import org.apache.tapestry.ioc.annotations.Inject;
/**
* Component for a single link to this object
*/
public class LinkOne
+ extends AbstractField
{
@Parameter( required = true )
private ${table.Name} value;
@@ -83,4 +85,9 @@
}
public boolean hasValue() { return value != null; }
+
+ protected void processSubmission( String s )
+ {
+ // nothing to do, I think
+ }
}
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2008-01-21 21:20:49 UTC (rev 261)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linklist.tml.vm 2008-01-24 23:33:14 UTC (rev 262)
@@ -1,2 +1,2 @@
-<label>${field.Name}</label>
+<t:label t:for="${field.VarName}"/>
<input t:type="$engine.lowerFirst("${field.JavaFieldType}")/LinkList" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.VarName}"/>
Modified: trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm 2008-01-21 21:20:49 UTC (rev 261)
+++ trunk/equanda-generate/src/main/velocity/t5gui/edit-tml/linkone.tml.vm 2008-01-24 23:33:14 UTC (rev 262)
@@ -1,2 +1,2 @@
-<label>${field.Name}</label>
+<t:label t:for="${field.VarName}"/>
<input t:type="$engine.lowerFirst("${field.JavaFieldType}")/LinkOne" t:label="${field.Name}" t:id="${field.VarName}" t:value="value.${field.VarName}" t:setter="${field.Name}Setter"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|