Menu
▾
▴
uni-d-cvs — CVS commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(104) |
Dec
(17) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(38) |
Feb
(203) |
Mar
(127) |
Apr
(194) |
May
(139) |
Jun
(237) |
Jul
(241) |
Aug
(213) |
Sep
(105) |
Oct
(227) |
Nov
(221) |
Dec
(76) |
| 2005 |
Jan
(228) |
Feb
(318) |
Mar
(154) |
Apr
(128) |
May
(184) |
Jun
(78) |
Jul
(150) |
Aug
(125) |
Sep
(95) |
Oct
(103) |
Nov
(153) |
Dec
(131) |
| 2006 |
Jan
(42) |
Feb
(138) |
Mar
(134) |
Apr
(119) |
May
(455) |
Jun
(137) |
Jul
(164) |
Aug
(146) |
Sep
(85) |
Oct
(65) |
Nov
(68) |
Dec
(60) |
| 2007 |
Jan
(41) |
Feb
(40) |
Mar
(62) |
Apr
(70) |
May
(85) |
Jun
(23) |
Jul
(4) |
Aug
(8) |
Sep
(19) |
Oct
(15) |
Nov
(3) |
Dec
(6) |
| 2008 |
Jan
(22) |
Feb
(29) |
Mar
(16) |
Apr
|
May
(9) |
Jun
(25) |
Jul
|
Aug
(9) |
Sep
(12) |
Oct
(15) |
Nov
(18) |
Dec
(7) |
| 2009 |
Jan
(25) |
Feb
(25) |
Mar
(21) |
Apr
(26) |
May
(18) |
Jun
(5) |
Jul
(18) |
Aug
(8) |
Sep
(8) |
Oct
(5) |
Nov
|
Dec
|
|
From: <max...@us...> - 2009-07-16 16:32:48
|
Revision: 3861
http://uni-d.svn.sourceforge.net/uni-d/?rev=3861&view=rev
Author: max_brod
Date: 2009-07-16 16:32:45 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
[UNI-421]
Different exception message for the "match" constraint, to allow a better translation.
Modified Paths:
--------------
trunk/Uni-d/client/src/main/java/be/unid/persistence/om/ExceptionCodes.java
trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm
trunk/Uni-d/template/src/main/webapp/translations-common.txt
Modified: trunk/Uni-d/client/src/main/java/be/unid/persistence/om/ExceptionCodes.java
===================================================================
--- trunk/Uni-d/client/src/main/java/be/unid/persistence/om/ExceptionCodes.java 2009-07-16 15:20:07 UTC (rev 3860)
+++ trunk/Uni-d/client/src/main/java/be/unid/persistence/om/ExceptionCodes.java 2009-07-16 16:32:45 UTC (rev 3861)
@@ -67,6 +67,7 @@
int UCV_DOWNCAST_CREATE_ERROR = 91015;
int UCV_INVALID_TABLE_TYPE = 91016;
int UCV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET = 91017;
+ int UCV_PATTERN_NOT_MATCHED_FOR_FIELD = 91018;
int CME_DATA_HAS_BEEN_ALREADY_CHANGED = 92001;
Modified: trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm
===================================================================
--- trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm 2009-07-16 15:20:07 UTC (rev 3860)
+++ trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm 2009-07-16 16:32:45 UTC (rev 3861)
@@ -42,7 +42,7 @@
Matcher matcher=pattern.matcher( $field.varName );
if (!matcher.matches())
{
- throw new UnidConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", $ii.Value);
+ throw new UnidConstraintViolation(UCV_PATTERN_NOT_MATCHED_FOR_FIELD, "field.${table.Name}.${field.Name}.label", $ii.Value);
}
#else
if (!(${field.varName}.compareTo($ii.Value)${ii.Test}0)) {
Modified: trunk/Uni-d/template/src/main/webapp/translations-common.txt
===================================================================
--- trunk/Uni-d/template/src/main/webapp/translations-common.txt 2009-07-16 15:20:07 UTC (rev 3860)
+++ trunk/Uni-d/template/src/main/webapp/translations-common.txt 2009-07-16 16:32:45 UTC (rev 3861)
@@ -140,6 +140,11 @@
.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 91018/Uni-d-exceptions
+.label.en Value of field $$1 doesn't match pattern '$2'
+.label.nl Waarde van veld $$1 is niet conform patroon '$2'
+.label.ro Valoarea campului $$1 nu corespunde patternului '$2'
+.label.fr La valeur du champ $$1 n'est pas conformément au modèle '$2'
.key 92001/Uni-d-exceptions
.label.en Data has already changed
.label.nl Data is reeds gewijzigd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-16 15:20:12
|
Revision: 3860
http://uni-d.svn.sourceforge.net/uni-d/?rev=3860&view=rev
Author: max_brod
Date: 2009-07-16 15:20:07 +0000 (Thu, 16 Jul 2009)
Log Message:
-----------
[UNI-421]
Support a new test for the "compare" contraint - "match". This is for string fields that should match a regular expression.
Modified Paths:
--------------
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMField.java
trunk/Uni-d/generate/src/main/resources/uni-d.dtd
trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm
trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase.java.vm
trunk/Uni-d/test/src/main/be/unid/test/xejb/CompareTest.java
trunk/Uni-d/test/src/uni-d/xejb/Compare.table
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMField.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMField.java 2009-07-13 06:50:59 UTC (rev 3859)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMField.java 2009-07-16 15:20:07 UTC (rev 3860)
@@ -757,7 +757,8 @@
{
gen.setFailed( true );
SaveException.error(
- "Field " + table.getName() + '.' + this.name + " is value-exclude so it cannot be displayed in lists!" );
+ "Field " + table.getName() + '.' + this.name +
+ " is value-exclude so it cannot be displayed in lists!" );
}
displayInLists = true;
}
@@ -1098,7 +1099,8 @@
( !attr.getValue( "test" ).equals( "<" ) ) &&
( !attr.getValue( "test" ).equals( ">" ) ) &&
( !attr.getValue( "test" ).equals( "<=" ) ) &&
- ( !attr.getValue( "test" ).equals( ">=" ) ) )
+ ( !attr.getValue( "test" ).equals( ">=" ) ) &&
+ ( !attr.getValue( "test" ).equals( "match" ) ) )
{
gen.setFailed( true );
SaveException.error( "Field " +
@@ -1106,6 +1108,16 @@
"test" ) + ')' );
return false;
}
+
+ if ( attr.getValue( "test" ).equals( "match" ) && !isString() )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Field " +
+ table.getName() + '.' + this.name +
+ " - invalid value for test. 'match' can only be used for string fields. " );
+ return false;
+ }
+
// check if combination of types (field and value) is valid
DateTimeFormatter df = DateTimeFormat.forPattern( "yyyy-MM-dd HH:mm:ss" );
String strDate = "";
@@ -1233,6 +1245,14 @@
}
else
{
+ if ( attr.getValue( "test" ).equals( "match" ) )
+ {
+ gen.setFailed( true );
+ SaveException.error( "Field " +
+ table.getName() + '.' + this.name +
+ " - 'match' is allowed only at field level. " );
+ return false;
+ }
switch ( type )
{
case TYPE_BOOLEAN:
Modified: trunk/Uni-d/generate/src/main/resources/uni-d.dtd
===================================================================
--- trunk/Uni-d/generate/src/main/resources/uni-d.dtd 2009-07-13 06:50:59 UTC (rev 3859)
+++ trunk/Uni-d/generate/src/main/resources/uni-d.dtd 2009-07-16 15:20:07 UTC (rev 3860)
@@ -435,10 +435,11 @@
<!--
Constraint where fields need to be compared. Can be defined at field or table level.
- test can be one of: =,!=,<,>,<=,>=
+ test can be one of: =,!=,<,>,<=,>=, match
For boolean fields, only "=" and "!=" are allowed as tests for compare.
Not allowed for compare for auto and calculated, and multiple.
If defined at table level, left can not be immutable
+ Match can be only used for string fields and only at field level.
-->
<!ELEMENT compare EMPTY>
<!ATTLIST compare
Modified: trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm
===================================================================
--- trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm 2009-07-13 06:50:59 UTC (rev 3859)
+++ trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase-compare.java.vm 2009-07-16 15:20:07 UTC (rev 3860)
@@ -37,16 +37,27 @@
#if( $field.isString() )
#if ($ii.fieldLevel)
if ($field.varName!=null) {
+ #if( $ii.Test.equals("match") )
+ Pattern pattern=Pattern.compile($ii.Value);
+ Matcher matcher=pattern.matcher( $field.varName );
+ if (!matcher.matches())
+ {
+ throw new UnidConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", $ii.Value);
+ }
+ #else
if (!(${field.varName}.compareTo($ii.Value)${ii.Test}0)) {
throw new UnidConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", $ii.Value);
+ }
+ #end
+ }
#else
String tmp=$ii.Value;
if (($field.varName!=null) && (tmp!=null)) {
if (!(${field.varName}.compareTo(tmp)${ii.Test}0)) {
throw new UnidConstraintViolation(UCV_COMPARE_CONSTRAINT_NOT_SATISFIED, "$ii.Test", "field.${table.Name}.${field.Name}.label", $ii.Value);
+ }
+ }
#end
- }
- }
#end
#if( $field.isBoolean() )
Modified: trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase.java.vm
===================================================================
--- trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase.java.vm 2009-07-13 06:50:59 UTC (rev 3859)
+++ trunk/Uni-d/generate/src/main/velocity/ejb3/MediatorBase.java.vm 2009-07-16 15:20:07 UTC (rev 3860)
@@ -52,7 +52,9 @@
import java.util.Iterator;
import java.util.ArrayList;
+import java.util.regex.*;
+
#set( $root=$table.Root )
#set( $parent="$!{table.ParentTable}Mediator" )
#if( $parent=="Mediator" ) #set( $parent="${root.Name}MediatorRoot" ) #end
Modified: trunk/Uni-d/test/src/main/be/unid/test/xejb/CompareTest.java
===================================================================
--- trunk/Uni-d/test/src/main/be/unid/test/xejb/CompareTest.java 2009-07-13 06:50:59 UTC (rev 3859)
+++ trunk/Uni-d/test/src/main/be/unid/test/xejb/CompareTest.java 2009-07-16 15:20:07 UTC (rev 3860)
@@ -30,6 +30,7 @@
import be.unid.persistence.om.UnidPersistenceException;
import be.unid.test.om.client.CompareEJBUtil;
import be.unid.test.om.client.CompareEJB;
+import be.unid.test.om.client.CompareProxy;
import java.util.Calendar;
import java.util.GregorianCalendar;
@@ -86,7 +87,8 @@
public void testCompareFailureBooleanField()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
try
{
obj.setBool1( true );
@@ -100,7 +102,8 @@
public void testCompareFailureBooleanGlobal()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
obj.setBool1( false );
try
{
@@ -115,7 +118,8 @@
public void testCompareFailureDoubleField()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
try
{
obj.setDouble1( 1.1 );
@@ -129,7 +133,8 @@
public void testCompareFailureDoubleGlobal()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
obj.setDouble1( 1.2 );
try
{
@@ -144,7 +149,8 @@
public void testCompareFailureStringField()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
try
{
obj.setStr1( "aaa" );
@@ -158,7 +164,8 @@
public void testCompareFailureStringGlobal()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
obj.setStr1( "bbb" );
try
{
@@ -173,7 +180,8 @@
public void testCompareFailureDateField()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
java.util.GregorianCalendar cal = new java.util.GregorianCalendar();
cal.set( Calendar.YEAR, 2000 );
try
@@ -189,7 +197,8 @@
public void testCompareFailureDateGlobal()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
GregorianCalendar cal = new GregorianCalendar();
cal.clear();
cal.set( 2005, 1, 1 );
@@ -208,7 +217,8 @@
public void testCompareFailureTimestampField()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
java.util.GregorianCalendar cal = new java.util.GregorianCalendar();
cal.set( Calendar.YEAR, 2020 );
try
@@ -224,7 +234,8 @@
public void testCompareFailureTimestampGlobal()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
java.util.GregorianCalendar cal = new java.util.GregorianCalendar();
cal.set( Calendar.YEAR, 2005 );
obj.setTime1( new java.sql.Timestamp( cal.getTime().getTime() ) );
@@ -241,7 +252,8 @@
public void testCompareFailureDateBuiltIn()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
try
{
obj.setDateFuture( new java.sql.Date( System.currentTimeMillis() ) );
@@ -255,7 +267,8 @@
public void testCompareFailureTimestampBuiltIn()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
try
{
obj.setTimePast( new java.sql.Timestamp( System.currentTimeMillis() + 1000 ) );
@@ -269,7 +282,8 @@
public void testCompareSuccessDateBuiltIn()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
try
{
obj.setDateFuture( new java.sql.Date( System.currentTimeMillis() + 3600 * 25 * 1000 ) );
@@ -283,7 +297,8 @@
public void testCompareSuccessTimestampBuiltIn()
throws Exception
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 1, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 1, 1 );
try
{
obj.setTimePast( new java.sql.Timestamp( System.currentTimeMillis() - 1000 ) );
@@ -299,11 +314,30 @@
{
try
{
- CompareEJB obj = CompareEJBUtil.get(); obj.init( 100, 1 );
+ CompareEJB obj = CompareEJBUtil.get();
+ obj.init( 100, 1 );
obj.remove();
fail( "compare ignored" );
}
catch ( UnidPersistenceException ucv )
{}
}
+
+ public void testMatch()
+ throws Exception
+ {
+ CompareProxy proxy = new CompareProxy();
+ proxy.setAlphanumericString( "" );
+ proxy.setTestImmutableDouble( 1.0 );
+ proxy.setAlphanumericString( "&&¬alphanumeric" );
+
+ try
+ {
+ proxy.unidUpdate();
+ fail( "compare ignored" );
+ }
+ catch ( UnidPersistenceException upe ) {}
+ proxy.setAlphanumericString( "alph1numer0c9" );
+ proxy.unidUpdate();
+ }
}
Modified: trunk/Uni-d/test/src/uni-d/xejb/Compare.table
===================================================================
--- trunk/Uni-d/test/src/uni-d/xejb/Compare.table 2009-07-13 06:50:59 UTC (rev 3859)
+++ trunk/Uni-d/test/src/uni-d/xejb/Compare.table 2009-07-16 15:20:07 UTC (rev 3860)
@@ -41,6 +41,12 @@
</constraints>
</field>
+ <field name="AlphanumericString" type="string">
+ <constraints>
+ <compare test="match" value="[a-z0-9A-Z]*"/>
+ </constraints>
+ </field>
+
<field name="Bool2" type="boolean"/>
<field name="Int2" type="int"/>
<field name="Double2" type="double"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-13 06:51:00
|
Revision: 3859
http://uni-d.svn.sourceforge.net/uni-d/?rev=3859&view=rev
Author: max_brod
Date: 2009-07-13 06:50:59 +0000 (Mon, 13 Jul 2009)
Log Message:
-----------
Cache reports in the Visit object to slightly improve speed of the menu.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/Visit.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/Visit.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/Visit.java 2009-07-12 10:52:35 UTC (rev 3858)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/Visit.java 2009-07-13 06:50:59 UTC (rev 3859)
@@ -49,6 +49,7 @@
private transient ReportParser reportParser;
private transient Parser borderParser;
private transient ReportDescription currentReport;
+ private transient List<ReportDescription> reports;
private transient boolean menuVisible = true;
private transient String language; // save the user language here, to test the setting realy took effect
private transient boolean refreshDone; // was a refresh tried (for setting the language)? Don't want to retry forever
@@ -66,17 +67,19 @@
public List<ReportDescription> getReports( String file, UnidBasePage pageForI18n )
{
- ReportParser parser = getReportParser( pageForI18n );
- parser.parse( file );
- return parser.getReports();
+ if ( reports == null )
+ {
+ ReportParser parser = getReportParser( pageForI18n );
+ parser.parse( file );
+ reports = parser.getReports();
+ }
+ return reports;
}
public List<ReportDescription> getReportsForTypes( String file, UnidBasePage pageForI18n, String... types )
{
- ReportParser parser = getReportParser( pageForI18n );
- parser.parse( file );
- List<ReportDescription> allReports = parser.getReports();
- List<ReportDescription> reports = new ArrayList<ReportDescription>();
+ List<ReportDescription> allReports = getReports( file, pageForI18n );
+ List<ReportDescription> reportsWithTypes = new ArrayList<ReportDescription>();
for ( ReportDescription report : allReports )
{
boolean found = true;
@@ -88,9 +91,9 @@
break;
}
}
- if ( found ) reports.add( report );
+ if ( found ) reportsWithTypes.add( report );
}
- return reports;
+ return reportsWithTypes;
}
private ReportParser getReportParser( UnidBasePage pageForI18n )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-12 10:52:42
|
Revision: 3858
http://uni-d.svn.sourceforge.net/uni-d/?rev=3858&view=rev
Author: max_brod
Date: 2009-07-12 10:52:35 +0000 (Sun, 12 Jul 2009)
Log Message:
-----------
Added indices.
Modified Paths:
--------------
trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/util/UnidAlert.table
Modified: trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/util/UnidAlert.table
===================================================================
--- trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/util/UnidAlert.table 2009-07-09 08:37:42 UTC (rev 3857)
+++ trunk/Uni-d/generate/src/main/resources/be/unid/infrastructure/util/UnidAlert.table 2009-07-12 10:52:35 UTC (rev 3858)
@@ -24,6 +24,7 @@
<constraints>
<required/>
</constraints>
+ <indexed/>
</field>
<field name="Cause" type="string" length="10">
@@ -70,6 +71,7 @@
<constraints>
<required/>
</constraints>
+ <indexed/>
</field>
</page>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-09 08:37:47
|
Revision: 3857
http://uni-d.svn.sourceforge.net/uni-d/?rev=3857&view=rev
Author: max_brod
Date: 2009-07-09 08:37:42 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
Make it possible to change prefered select for a combobox link dinamically.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/Input.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/Input.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/Input.java 2009-07-08 11:02:26 UTC (rev 3856)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/Input.java 2009-07-09 08:37:42 UTC (rev 3857)
@@ -449,6 +449,8 @@
public String getPreferedSelect() { return preferedSelect; }
+ public void setPreferedSelect( String preferedSelect ) { this.preferedSelect = preferedSelect; }
+
public boolean isShowLinkedTableFully()
{
return showLinkedTableFully;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-08 11:03:01
|
Revision: 3856
http://uni-d.svn.sourceforge.net/uni-d/?rev=3856&view=rev
Author: max_brod
Date: 2009-07-08 11:02:26 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
[ICT-1685]
New tag, "online-help-page" for tables.
Modified Paths:
--------------
trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm
trunk/Uni-d/docs/src/wiki/object-model.mm
trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Table.xml.vm
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMTable.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/add/AddPage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/edit/EditPage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPage.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/view/ViewPage.java
Modified: trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm
===================================================================
--- trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm 2009-07-08 09:41:09 UTC (rev 3855)
+++ trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm 2009-07-08 11:02:26 UTC (rev 3856)
@@ -267,6 +267,9 @@
<node COLOR="#006699" CREATED="1180458411313" ID="Freemind_Link_1209181793" MODIFIED="1180458415800" TEXT="data-filter">
<node CREATED="1180458494229" ID="Freemind_Link_1113252348" MODIFIED="1180458653149" TEXT="Comma separated list of filter names. These are filters which are applied to all the selectors."/>
</node>
+<node COLOR="#006699" CREATED="1247047239875" ID="Freemind_Link_346725937" MODIFIED="1247047329203" TEXT="online-help-page?">
+<node CREATED="1247047247203" ID="Freemind_Link_1104616580" MODIFIED="1247047270578" TEXT="Name of a custom page to use for online help. If this is not given, the generated page is shown, with all fields and their descriptions"/>
</node>
</node>
+</node>
</map>
Modified: trunk/Uni-d/docs/src/wiki/object-model.mm
===================================================================
(Binary files differ)
Modified: trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Table.xml.vm
===================================================================
--- trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Table.xml.vm 2009-07-08 09:41:09 UTC (rev 3855)
+++ trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Table.xml.vm 2009-07-08 11:02:26 UTC (rev 3856)
@@ -77,6 +77,10 @@
<description-field name="$table.FieldDescription.Name"/>
#end
+#if( $table.hasOnlineHelpPage() )
+ <online-help-page>$table.OnlineHelpPage</online-help-page>
+#end
+
#foreach( $page in $table.Pages )
#parse( "Page.xml.vm" )
#end
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMTable.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMTable.java 2009-07-08 09:41:09 UTC (rev 3855)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMTable.java 2009-07-08 11:02:26 UTC (rev 3856)
@@ -48,7 +48,8 @@
{
public static final int TAG_SECURITY_ROLE_REMOVE = 1;
- public static final int TAG_UNKNOWN = 2;
+ public static final int TAG_ONLINE_HELP_PAGE = 2;
+ public static final int TAG_UNKNOWN = 3;
private String name; // table name
private String type;
@@ -80,6 +81,8 @@
private boolean hideAddButton; // hide the Add button in gui?
+ private String onlineHelpPage; // a custom page for online help
+
private ArrayList<LinkedSelect> linkedSelects =
new ArrayList<LinkedSelect>(); // list with selects that have a single parameter of this table type
private ArrayList<LinkedSelect> moreLinkedSelects =
@@ -196,6 +199,10 @@
{
hideAddButton = true;
}
+ else if ( tag.equals( "online-help-page" ) )
+ {
+ inTag = TAG_ONLINE_HELP_PAGE;
+ }
else
{
return super.canAppendChild( tag, attr );
@@ -339,6 +346,10 @@
securityRoleRemove += arg;
}
}
+ else if ( inTag == TAG_ONLINE_HELP_PAGE )
+ {
+ onlineHelpPage = arg.toString();
+ }
inTag = GMTable.TAG_UNKNOWN;
}
@@ -542,4 +553,14 @@
{
this.hideAddButton = hideAddButton;
}
+
+ public String getOnlineHelpPage()
+ {
+ return onlineHelpPage;
+ }
+
+ public boolean hasOnlineHelpPage()
+ {
+ return onlineHelpPage != null;
+ }
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/add/AddPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/add/AddPage.java 2009-07-08 09:41:09 UTC (rev 3855)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/add/AddPage.java 2009-07-08 11:02:26 UTC (rev 3856)
@@ -71,13 +71,22 @@
public void help()
{
- HelpPage page = (HelpPage) getNavigationManager().getForwardPage( this, "HelpPage", true );
- List descriptions = new ArrayList();
- descriptions.add( getPageParameters().getTableDescription() );
- List<String> titles = new ArrayList<String>();
- titles.add( "" );
- page.getPageParameters().setDescriptions( descriptions );
- page.getPageParameters().setTitles( titles );
- getNavigationManager().forward( page );
+ if ( getPageParameters().getTableDescription().hasOnlineHelpPage() )
+ {
+ NavigationablePageImpl page = (NavigationablePageImpl) getNavigationManager()
+ .getForwardPage( this, getPageParameters().getTableDescription().getOnlineHelpPage(), true );
+ getNavigationManager().forward( page );
+ }
+ else
+ {
+ HelpPage page = (HelpPage) getNavigationManager().getForwardPage( this, "HelpPage", true );
+ List descriptions = new ArrayList();
+ descriptions.add( getPageParameters().getTableDescription() );
+ List<String> titles = new ArrayList<String>();
+ titles.add( "" );
+ page.getPageParameters().setDescriptions( descriptions );
+ page.getPageParameters().setTitles( titles );
+ getNavigationManager().forward( page );
+ }
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/edit/EditPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/edit/EditPage.java 2009-07-08 09:41:09 UTC (rev 3855)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/edit/EditPage.java 2009-07-08 11:02:26 UTC (rev 3856)
@@ -126,13 +126,22 @@
public void help()
{
- HelpPage page = (HelpPage) getNavigationManager().getForwardPage( this, "HelpPage", true );
- List descriptions = new ArrayList();
- descriptions.add( getPageParameters().getTableDescription() );
- List<String> titles = new ArrayList<String>();
- titles.add( "" );
- page.getPageParameters().setDescriptions( descriptions );
- page.getPageParameters().setTitles( titles );
- getNavigationManager().forward( page );
+ if ( getPageParameters().getTableDescription().hasOnlineHelpPage() )
+ {
+ NavigationablePageImpl page = (NavigationablePageImpl) getNavigationManager()
+ .getForwardPage( this, getPageParameters().getTableDescription().getOnlineHelpPage(), true );
+ getNavigationManager().forward( page );
+ }
+ else
+ {
+ HelpPage page = (HelpPage) getNavigationManager().getForwardPage( this, "HelpPage", true );
+ List descriptions = new ArrayList();
+ descriptions.add( getPageParameters().getTableDescription() );
+ List<String> titles = new ArrayList<String>();
+ titles.add( "" );
+ page.getPageParameters().setDescriptions( descriptions );
+ page.getPageParameters().setTitles( titles );
+ getNavigationManager().forward( page );
+ }
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPage.java 2009-07-08 09:41:09 UTC (rev 3855)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/select/SelectPage.java 2009-07-08 11:02:26 UTC (rev 3856)
@@ -82,15 +82,25 @@
public void help()
{
- if ( getPageParameters().getSelectDescription().getSelections().size() == 0 ) return;
- HelpPage page = (HelpPage) getNavigationManager().getForwardPage( this, "HelpPage", true );
- List descriptions = new ArrayList();
- descriptions.add( getPageParameters().getSelectDescription() );
- List<String> titles = new ArrayList<String>();
- titles.add( "" );
- page.getPageParameters().setDescriptions( descriptions );
- page.getPageParameters().setTitles( titles );
- getNavigationManager().forward( page );
+ if ( getPageParameters().getSelectDescription().getTable().hasOnlineHelpPage() )
+ {
+ NavigationablePageImpl page = (NavigationablePageImpl) getNavigationManager()
+ .getForwardPage( this, getPageParameters().getSelectDescription().getTable().getOnlineHelpPage(),
+ true );
+ getNavigationManager().forward( page );
+ }
+ else
+ {
+ if ( getPageParameters().getSelectDescription().getSelections().size() == 0 ) return;
+ HelpPage page = (HelpPage) getNavigationManager().getForwardPage( this, "HelpPage", true );
+ List descriptions = new ArrayList();
+ descriptions.add( getPageParameters().getSelectDescription() );
+ List<String> titles = new ArrayList<String>();
+ titles.add( "" );
+ page.getPageParameters().setDescriptions( descriptions );
+ page.getPageParameters().setTitles( titles );
+ getNavigationManager().forward( page );
+ }
}
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/view/ViewPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/view/ViewPage.java 2009-07-08 09:41:09 UTC (rev 3855)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/view/ViewPage.java 2009-07-08 11:02:26 UTC (rev 3856)
@@ -113,13 +113,22 @@
public void help()
{
- HelpPage page = (HelpPage) getNavigationManager().getForwardPage( this, "HelpPage", true );
- List descriptions = new ArrayList();
- descriptions.add( getPageParameters().getTableDescription() );
- List<String> titles = new ArrayList<String>();
- titles.add( "" );
- page.getPageParameters().setDescriptions( descriptions );
- page.getPageParameters().setTitles( titles );
- getNavigationManager().forward( page );
+ if ( getPageParameters().getTableDescription().hasOnlineHelpPage() )
+ {
+ NavigationablePageImpl page = (NavigationablePageImpl) getNavigationManager()
+ .getForwardPage( this, getPageParameters().getTableDescription().getOnlineHelpPage(), true );
+ getNavigationManager().forward( page );
+ }
+ else
+ {
+ HelpPage page = (HelpPage) getNavigationManager().getForwardPage( this, "HelpPage", true );
+ List descriptions = new ArrayList();
+ descriptions.add( getPageParameters().getTableDescription() );
+ List<String> titles = new ArrayList<String>();
+ titles.add( "" );
+ page.getPageParameters().setDescriptions( descriptions );
+ page.getPageParameters().setTitles( titles );
+ getNavigationManager().forward( page );
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-08 09:41:10
|
Revision: 3855
http://uni-d.svn.sourceforge.net/uni-d/?rev=3855&view=rev
Author: max_brod
Date: 2009-07-08 09:41:09 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
[ICT-1685]
New tag, "online-help-page" for tables.
Modified Paths:
--------------
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMRootTable.java
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java
trunk/Uni-d/generate/src/main/resources/uni-d.dtd
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMRootTable.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMRootTable.java 2009-07-07 09:59:27 UTC (rev 3854)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMRootTable.java 2009-07-08 09:41:09 UTC (rev 3855)
@@ -902,4 +902,14 @@
{
return getTable().isHideAddButton();
}
+
+ public String getOnlineHelpPage()
+ {
+ return getTable().getOnlineHelpPage();
+ }
+
+ public boolean hasOnlineHelpPage()
+ {
+ return getOnlineHelpPage() != null;
+ }
}
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java 2009-07-07 09:59:27 UTC (rev 3854)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java 2009-07-08 09:41:09 UTC (rev 3855)
@@ -61,7 +61,8 @@
public static final int TAG_SECURITY_ROLE_REMOVE = 2;
public static final int TAG_DESCRIPTION = 3;
public static final int TAG_DATA_FILTER = 4;
- public static final int TAG_UNKNOWN = 5;
+ public static final int TAG_ONLINE_HELP_PAGE = 5;
+ public static final int TAG_UNKNOWN = 6;
private String name; // table name
private String dbName; // table name at database level
@@ -96,6 +97,7 @@
private String category = "default";
private String displayIndex = "99";
private String dataFilter = "";
+ private String onlineHelpPage;
// constraints
ArrayList<MutableIf> immutableIf;
@@ -422,6 +424,10 @@
hideAddButton = true;
return false;
}
+ else if ( tag.equals( "online-help-page" ) )
+ {
+ inTag = TAG_ONLINE_HELP_PAGE;
+ }
else if ( tag.equals( "hide" ) )
{
if ( attr.getValue( "if-class" ) == null )
@@ -1188,6 +1194,9 @@
case TAG_DATA_FILTER:
dataFilter += arg;
break;
+ case TAG_ONLINE_HELP_PAGE:
+ onlineHelpPage=arg.toString();
+ break;
}
inTag = TAG_UNKNOWN;
}
@@ -1296,4 +1305,9 @@
public void setOMTable( OMTable table ) {}
public String getDataFilter() { return dataFilter; }
+
+ public String getOnlineHelpPage()
+ {
+ return onlineHelpPage;
+ }
}
\ No newline at end of file
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java 2009-07-07 09:59:27 UTC (rev 3854)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java 2009-07-08 09:41:09 UTC (rev 3855)
@@ -125,5 +125,6 @@
put( "full-text-searchable", null );
put( "hide-anchors", null );
put( "filter", null );
+ put( "online-help-page", null );
}
}
Modified: trunk/Uni-d/generate/src/main/resources/uni-d.dtd
===================================================================
--- trunk/Uni-d/generate/src/main/resources/uni-d.dtd 2009-07-07 09:59:27 UTC (rev 3854)
+++ trunk/Uni-d/generate/src/main/resources/uni-d.dtd 2009-07-08 09:41:09 UTC (rev 3855)
@@ -79,7 +79,8 @@
(action|%param.tag;)*,
(include)*,
(data-filter)?,
- (no-translation)?
+ (no-translation)?,
+ (online-help-page)?
)>
<!ATTLIST table
name CDATA #IMPLIED
@@ -163,6 +164,11 @@
-->
<!ELEMENT no-translation EMPTY>
+<!--
+ Name of a custom page to use for online help. If this is not given, the generated page is shown,
+ with all fields and their descriptions
+-->
+<!ELEMENT online-help-page (#PCDATA)>
<!-- Allow grouping of fields. In a GUI this could be represented by a box around the items. -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-07 10:34:31
|
Revision: 3853
http://uni-d.svn.sourceforge.net/uni-d/?rev=3853&view=rev
Author: max_brod
Date: 2009-07-07 07:35:09 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
Have a static function too to check country codes.
Modified Paths:
--------------
trunk/Uni-d/server/src/main/java/be/unid/validation/ISOCountry2Letter.java
Modified: trunk/Uni-d/server/src/main/java/be/unid/validation/ISOCountry2Letter.java
===================================================================
--- trunk/Uni-d/server/src/main/java/be/unid/validation/ISOCountry2Letter.java 2009-07-06 14:52:04 UTC (rev 3852)
+++ trunk/Uni-d/server/src/main/java/be/unid/validation/ISOCountry2Letter.java 2009-07-07 07:35:09 UTC (rev 3853)
@@ -306,4 +306,8 @@
return str;
}
+ public static boolean isValidCountryCode( String s)
+ {
+ return countries.contains( s );
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-07 10:18:39
|
Revision: 3854
http://uni-d.svn.sourceforge.net/uni-d/?rev=3854&view=rev
Author: max_brod
Date: 2009-07-07 09:59:27 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
[DEV-117]
Newer jars (jasperreports 3.5.2)
Added Paths:
-----------
trunk/Uni-d/lib/jasper/barbecue-1.5-beta1.jar
trunk/Uni-d/lib/jasper/commons-beanutils-1.8.0.jar
trunk/Uni-d/lib/jasper/commons-collections-3.2.1.jar
trunk/Uni-d/lib/jasper/commons-dbcp-1.2.2.jar
trunk/Uni-d/lib/jasper/commons-digester-1.7.jar
trunk/Uni-d/lib/jasper/commons-javaflow-20060411.jar
trunk/Uni-d/lib/jasper/commons-logging-1.1.jar
trunk/Uni-d/lib/jasper/commons-math-1.0.jar
trunk/Uni-d/lib/jasper/commons-pool-1.3.jar
trunk/Uni-d/lib/jasper/commons-vfs-1.0.jar
trunk/Uni-d/lib/jasper/iReport.jar
trunk/Uni-d/lib/jasper/iText-2.1.0.jar
trunk/Uni-d/lib/jasper/jasperreports-3.5.2.jar
trunk/Uni-d/lib/jasper/jasperreports-chart-themes-3.5.2.jar
trunk/Uni-d/lib/jasper/jasperreports-dejavu-fonts.jar
trunk/Uni-d/lib/jasper/jasperreports-extensions-1.3.1.jar
trunk/Uni-d/lib/jasper/jfreechart-1.0.12.jar
trunk/Uni-d/lib/jasper/poi-3.2-FINAL-20081019.jar
trunk/Uni-d/lib/jasper/spring.jar
Removed Paths:
-------------
trunk/Uni-d/lib/jasper/JasperBabylon-1.0.0.jar
trunk/Uni-d/lib/jasper/commons-beanutils-1.7.jar
trunk/Uni-d/lib/jasper/commons-codec-1.3.jar
trunk/Uni-d/lib/jasper/commons-collections-2.1.jar
trunk/Uni-d/lib/jasper/commons-dbcp-1.2.1.jar
trunk/Uni-d/lib/jasper/commons-digester-1.7.jar
trunk/Uni-d/lib/jasper/commons-httpclient-3.1.jar
trunk/Uni-d/lib/jasper/commons-javaflow-20060411.jar
trunk/Uni-d/lib/jasper/commons-logging-1.0.2.jar
trunk/Uni-d/lib/jasper/commons-logging-api-1.0.2.jar
trunk/Uni-d/lib/jasper/commons-math-1.0.jar
trunk/Uni-d/lib/jasper/commons-pool-1.3.jar
trunk/Uni-d/lib/jasper/commons-vfs-1.0.jar
trunk/Uni-d/lib/jasper/iReport.jar
trunk/Uni-d/lib/jasper/iTextAsian.jar
trunk/Uni-d/lib/jasper/itext-1.3.1.jar
trunk/Uni-d/lib/jasper/jasperreports-3.0.0.jar
trunk/Uni-d/lib/jasper/jasperreports-extensions-1.3.1.jar
trunk/Uni-d/lib/jasper/jasperreports-flash-2.0.5.jar
trunk/Uni-d/lib/jasper/jfreechart-1.0.3.jar
trunk/Uni-d/lib/jasper/poi-3.0.1-FINAL-20070705.jar
Deleted: trunk/Uni-d/lib/jasper/JasperBabylon-1.0.0.jar
===================================================================
(Binary files differ)
Added: trunk/Uni-d/lib/jasper/barbecue-1.5-beta1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/lib/jasper/barbecue-1.5-beta1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Uni-d/lib/jasper/commons-beanutils-1.7.jar
===================================================================
(Binary files differ)
Added: trunk/Uni-d/lib/jasper/commons-beanutils-1.8.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/lib/jasper/commons-beanutils-1.8.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Uni-d/lib/jasper/commons-codec-1.3.jar
===================================================================
(Binary files differ)
Deleted: trunk/Uni-d/lib/jasper/commons-collections-2.1.jar
===================================================================
(Binary files differ)
Added: trunk/Uni-d/lib/jasper/commons-collections-3.2.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/lib/jasper/commons-collections-3.2.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Uni-d/lib/jasper/commons-dbcp-1.2.1.jar
===================================================================
(Binary files differ)
Added: trunk/Uni-d/lib/jasper/commons-dbcp-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/lib/jasper/commons-dbcp-1.2.2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Uni-d/lib/jasper/commons-digester-1.7.jar
===================================================================
(Binary files differ)
Added: trunk/Uni-d/lib/jasper/commons-digester-1.7.jar
===================================================================
(Binary files differ)
Property changes on: trunk/Uni-d/lib/jasper/commons-digester-1.7.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/Uni-d/lib/jasper/commons-httpclient-3.1.jar
===================================================================
(Binary files differ)
Deleted: trunk/Uni-d/lib/jasper/commons-javaflow-20060411.jar
===================================================================
--- trunk/Uni-d/lib/jasper/commons-javaflow-20060411.jar 2009-07-07 07:35:09 UTC (rev 3853)
+++ trunk/Uni-d/lib/jasper/commons-javaflow-20060411.jar 2009-07-07 09:59:27 UTC (rev 3854)
@@ -1,722 +0,0 @@
-PK
- |
|
From: <pus...@us...> - 2009-07-06 14:52:06
|
Revision: 3852
http://uni-d.svn.sourceforge.net/uni-d/?rev=3852&view=rev
Author: pushkutza
Date: 2009-07-06 14:52:04 +0000 (Mon, 06 Jul 2009)
Log Message:
-----------
fix - dont show empty table categories
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-07-03 12:41:03 UTC (rev 3851)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-07-06 14:52:04 UTC (rev 3852)
@@ -33,7 +33,6 @@
import be.unid.tapestry.components.shared.DescriptionFactory;
import be.unid.tapestry.model.GMTable;
import be.unid.tapestry.pages.UnidBasePage;
-import be.unid.tapestry.parser.border.Parser;
import be.unid.tapestry.parser.border.BorderItemTranslator;
import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.tapestry.rights.AccessRight;
@@ -149,15 +148,16 @@
rep[ 1 ] +
"\"; field=document.getElementById(\"borderHiddenField2Id\"); field.value=\"report\"; field.parentNode.submit(); ";
children.add( new BorderItemDescription( rep[ 0 ], item.getIcon(),
- pageStr,
- null,
- new ArrayList<BorderItemDescription>() ) );
+ pageStr,
+ null,
+ new ArrayList<BorderItemDescription>() ) );
}
}
}
}
}
- return new BorderItemDescription( translation, item.getIcon(), item.getPage(), item.getTranslatorClass(), children );
+ return new BorderItemDescription( translation, item.getIcon(), item.getPage(), item.getTranslatorClass(),
+ children );
}
public List getItems()
@@ -231,8 +231,11 @@
tableLabel = tableLabel.replace( "\'", "'" );
calculatedTables.add( new String[]{ tableLabel, table, gmTable.getDisplayIndex() } );
}
- Collections.sort( calculatedTables, translatedItemComparator );
- calculatedTableCategories.put( calculatedCategory, calculatedTables );
+ if ( !calculatedTables.isEmpty() )
+ {
+ Collections.sort( calculatedTables, translatedItemComparator );
+ calculatedTableCategories.put( calculatedCategory, calculatedTables );
+ }
}
return calculatedTableCategories;
}
@@ -442,7 +445,7 @@
String translationClass;
public BorderItemDescription( String key, String icon, String page, String translationClass,
- List<BorderItemDescription> items )
+ List<BorderItemDescription> items )
{
this.key = key;
this.icon = icon;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-03 13:11:18
|
Revision: 3851
http://uni-d.svn.sourceforge.net/uni-d/?rev=3851&view=rev
Author: max_brod
Date: 2009-07-03 12:41:03 +0000 (Fri, 03 Jul 2009)
Log Message:
-----------
[ICT-1626]
Support a parameter "readonly" for renderers.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/CommonInputContainerImpl.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/CommonInputContainerImpl.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/CommonInputContainerImpl.java 2009-07-03 10:54:37 UTC (rev 3850)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/CommonInputContainerImpl.java 2009-07-03 12:41:03 UTC (rev 3851)
@@ -100,6 +100,10 @@
if ( getInternalDisplayMode() == DisplayMode.VIEW ) return true;
if ( getDescription().isCalculated() || getDescription().isAuto() ) return true;
if ( getInternalDisplayMode() == DisplayMode.EDIT && getDescription().isImmutable() ) return true;
+ if ( "true".equals( getRenderer().getParameter( "readonly" ) ) )
+ {
+ return true;
+ }
return false;
}
@@ -175,9 +179,10 @@
{
return new ChoiceFieldSelectionModel( getDescription(), isRequired(), this );
}
- if (getRenderer().isTypeChoice())
+ if ( getRenderer().isTypeChoice() )
{
- return new RendererChoiceSelectionModel(getDescription().getFieldType(), isRequired(), this, getRenderer().getParameter( "class"));
+ return new RendererChoiceSelectionModel( getDescription().getFieldType(), isRequired(), this,
+ getRenderer().getParameter( "class" ) );
}
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-07-03 10:54:48
|
Revision: 3850
http://uni-d.svn.sourceforge.net/uni-d/?rev=3850&view=rev
Author: pushkutza
Date: 2009-07-03 10:54:37 +0000 (Fri, 03 Jul 2009)
Log Message:
-----------
ICT-1663
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.script
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-07-02 08:39:54 UTC (rev 3849)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.html 2009-07-03 10:54:37 UTC (rev 3850)
@@ -80,7 +80,7 @@
onchange="prop:changeComboboxSelection"/>
<span jwcid="@If" condition="prop:notHiddenAnchors">
- <span jwcid="@LinkSubmit" onclick="clearValidation(this);" class="addLinkClass displayInline"
+ <span jwcid="@LinkSubmit" onclick="clearValidation(this);" class="displayInline addLinkClass"
listener="listener:prepareReturnHandler" action="listener:runAdd" id="prop:addId">
<span key="Add"/>
</span>
@@ -89,7 +89,7 @@
</span>
<span jwcid="@If" condition="prop:notHiddenAnchors">
- <span jwcid="display@LinkSubmit" onclick="clearValidation(this);" class="viewLinkClass displayInline"
+ <span jwcid="display@LinkSubmit" onclick="clearValidation(this);" class="displayInline viewLinkClass"
listener="listener:prepareReturnHandler" action="listener:runView" id="prop:viewId">
<span jwcid="@If" condition="prop:comboboxOrEmbedded">
<span jwcid="@If" condition="prop:valueSet"><span class="viewLinkClassCombobox"><span
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.script
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.script 2009-07-02 08:39:54 UTC (rev 3849)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidLinkInput/UnidLinkInput.script 2009-07-03 10:54:37 UTC (rev 3850)
@@ -22,6 +22,7 @@
function changeComboSelection(element, fieldName, isFake)
{
+ //alert("changeComboSelection");
var sel = element.options[element.selectedIndex].innerHTML;
var display = searchByIdStart('display', element.parentNode.getElementsByTagName('A'));
var input = searchByIdStart('inputBox', element.parentNode.getElementsByTagName('INPUT'));
@@ -42,6 +43,9 @@
if (display!=null) display.innerHTML = "View";
if ( isFake ) input.value = sel;
}
+ var toeval = 'onChangeCombobox${onchange}(element, fieldName, isFake )';
+ //alert(toeval);
+ eval(toeval);
}
var formerValueForInputBox = null;
@@ -239,6 +243,18 @@
return false;
}
+ function onChangeCombobox${onchange}(element, fieldName, isFake)
+ {
+ //alert("element : " + element);
+ <if-not expression="onchange == null || onchange.equals('')">
+ if ( window.${onchange}Combobox )
+ {
+ return window.${onchange}Combobox(element, fieldName, isFake);
+ }
+ </if-not>
+ return false;
+ }
+
function ajaxReceive${onchange}(element, uoid, inputValue, displayValue, isFake, isCombo, error, arr)
{
<if-not expression="onchange == null || onchange.equals('')">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-02 08:40:04
|
Revision: 3849
http://uni-d.svn.sourceforge.net/uni-d/?rev=3849&view=rev
Author: max_brod
Date: 2009-07-02 08:39:54 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
[ICT-1671]
Changes in useradmin pages, use the display-in-lists tag.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.java 2009-07-02 08:12:41 UTC (rev 3848)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.java 2009-07-02 08:39:54 UTC (rev 3849)
@@ -155,7 +155,7 @@
if ( value == null )
{
if ( !useDisplay ) return true;
- return getFieldDescription().isDisplayed();
+ return getFieldDescription().isDisplayedInLists();
}
return value.equals( DisplayPreferences.DISPLAY );
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java 2009-07-02 08:12:41 UTC (rev 3848)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java 2009-07-02 08:39:54 UTC (rev 3849)
@@ -185,7 +185,7 @@
}
// save list prefs
if ( isDifferent( params.getSelectPref().get( key ), params.getCacheSelectPref().get( key ),
- field.isDisplayed() ? "DISPLAY" : "HIDE" ) )
+ field.isDisplayedInLists() ? "DISPLAY" : "HIDE" ) )
{
getSessionUserAdmin()
.setListPreferenceDisplay( key, AccessRight.TABLE_PREFERENCE_DISPLAY.getId().equals(
@@ -198,7 +198,7 @@
}
// save report prefs
if ( isDifferent( params.getReportPref().get( key ), params.getCacheReportPref().get( key ),
- field.isDisplayed() ? "DISPLAY" : "HIDE" ) )
+ field.isDisplayedInLists() ? "DISPLAY" : "HIDE" ) )
{
getSessionUserAdmin()
.setReportPreferenceDisplay( key, AccessRight.TABLE_PREFERENCE_DISPLAY.getId().equals(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-07-02 08:12:48
|
Revision: 3848
http://uni-d.svn.sourceforge.net/uni-d/?rev=3848&view=rev
Author: max_brod
Date: 2009-07-02 08:12:41 +0000 (Thu, 02 Jul 2009)
Log Message:
-----------
[ICT-1671]
Added new tag, "display-in-lists", to make it possible to have fields visible only in select results (without beeing visible in the information shown for link fields).
Modified Paths:
--------------
trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm
trunk/Uni-d/docs/src/wiki/object-model.mm
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMField.java
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java
trunk/Uni-d/generate/src/main/resources/uni-d.dtd
trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Field.xml.vm
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMField.java
trunk/Uni-d/test/src/uni-d/xejb/CocoonMan.table
Modified: trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm
===================================================================
--- trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm 2009-06-24 16:50:01 UTC (rev 3847)
+++ trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm 2009-07-02 08:12:41 UTC (rev 3848)
@@ -1,9 +1,9 @@
-<map version="0.8.0">
+<map version="0.8.1">
<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
<node CREATED="1146160158228" ID="Freemind_Link_1338830509" MODIFIED="1146209410674" TEXT="GUI Descriptors model">
<cloud/>
<hook NAME="accessories/plugins/NodeNote.properties">
-<text>This is a simplified version of the Object model - only contains the info needed for the GUI.



In this map, only the new nodes (not present in the Object model) are documented.</text>
+<text>This is a simplified version of the Object model - only contains the info needed for the GUI.





In this map, only the new nodes (not present in the Object model) are documented.</text>
</hook>
<node COLOR="#006699" CREATED="1146160210192" ID="_" MODIFIED="1146160479210" POSITION="right" TEXT="table">
<edge WIDTH="thin"/>
@@ -86,6 +86,9 @@
<node COLOR="#006699" CREATED="1146208038743" ID="Freemind_Link_623250894" MODIFIED="1146208051124" TEXT="auto?"/>
<node COLOR="#006699" CREATED="1146208042017" ID="Freemind_Link_613190113" MODIFIED="1146208054754" TEXT="calculated?"/>
<node COLOR="#006699" CREATED="1146208047673" ID="Freemind_Link_1758583499" MODIFIED="1146208062247" TEXT="display?"/>
+<node COLOR="#006699" CREATED="1246521718281" ID="Freemind_Link_970391669" MODIFIED="1246521723890" TEXT="display-in-lists">
+<node CREATED="1246521725640" ID="Freemind_Link_491528483" MODIFIED="1246521743234" TEXT="show field in select results for this table?"/>
+</node>
<node COLOR="#006699" CREATED="1146664520426" ID="Freemind_Link_659302679" MODIFIED="1146664527397" TEXT="embeded?"/>
<node COLOR="#006699" CREATED="1151159842194" ID="Freemind_Link_1109849859" MODIFIED="1151159857320" TEXT="immutable-if">
<node COLOR="#338800" CREATED="1151160185106" ID="Freemind_Link_1361739095" MODIFIED="1151160194219" TEXT="field"/>
Modified: trunk/Uni-d/docs/src/wiki/object-model.mm
===================================================================
(Binary files differ)
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMField.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMField.java 2009-06-24 16:50:01 UTC (rev 3847)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMField.java 2009-07-02 08:12:41 UTC (rev 3848)
@@ -102,6 +102,7 @@
OMTable table; // table in which this field is originally defined
private int inTag; // currently processed tag for appendData
private boolean display; // show field in short reference to object?
+ private boolean displayInLists; // show field in select results for this table?
private boolean hide; // hide field in GUI?
private boolean hideIf; // hide field in GUI depending on a class?
private String hideIfClass; // Class implementing the HideIf interface, to be used in GUI at runtime, determining the visibility of the field
@@ -155,7 +156,7 @@
"owner", "auto", "calculated", "other-side-multiple", "other-side-single",
"value-include", "value-exclude", "cascade-keep", "cascade-delete", "allow-delete",
"default", "use-relation-table", "use-relation-field", "suggest", "cloneable", "not-cloneable",
- "constraints", "display", "no-display", "hide", "no-hide", "ws-value",
+ "constraints", "display", "no-display", "display-in-lists", "hide", "no-hide", "ws-value",
"ws-role", "buildvalue", "indexed", "case", "security-role", "if",
"is-reference", "is-description", "embedded", "include", "no-translation", "full-text-searchable", "filter" };
@@ -744,6 +745,22 @@
}
display = true;
}
+ else if ( tag.equals( "display-in-lists" ) )
+ {
+ if ( internal )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Field " + table.getName() + '.' + this.name + " is internal so it cannot be displayed in lists!" );
+ }
+ if ( valueExclude )
+ {
+ gen.setFailed( true );
+ SaveException.error(
+ "Field " + table.getName() + '.' + this.name + " is value-exclude so it cannot be displayed in lists!" );
+ }
+ displayInLists = true;
+ }
else if ( tag.equals( "no-display" ) )
{
display = false;
@@ -1579,6 +1596,11 @@
return display;
}
+ public boolean isDisplayedInLists()
+ {
+ return displayInLists || display;
+ }
+
public boolean isHidden()
{
return hide;
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java 2009-06-24 16:50:01 UTC (rev 3847)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java 2009-07-02 08:12:41 UTC (rev 3848)
@@ -84,6 +84,7 @@
put( "no-display", new ElementInfo( "no-display", "display-or-no-display" ) );
put( "hide", new ElementInfo( "hide", "hide-or-no-hide" ) );
put( "no-hide", new ElementInfo( "no-hide", "hide-or-no-hide" ) );
+ put( "display-in-lists", null );
put( "buildvalue", new ElementInfo( "buildvalue", "buildvalue" ) );
put( "indexed", new ElementInfo( "indexed", "indexed" ) );
put( "case", new ElementInfo( "case", "case" ) );
Modified: trunk/Uni-d/generate/src/main/resources/uni-d.dtd
===================================================================
--- trunk/Uni-d/generate/src/main/resources/uni-d.dtd 2009-06-24 16:50:01 UTC (rev 3847)
+++ trunk/Uni-d/generate/src/main/resources/uni-d.dtd 2009-07-02 08:12:41 UTC (rev 3848)
@@ -206,6 +206,7 @@
(cloneable|not-cloneable)?,
(constraints|%param.tag;)?,
(display|no-display)?,(hide|no-hide)?,
+ (display-in-lists)?,
(ws-value)?, (ws-role)?,
(buildvalue)?,
(indexed)?,
@@ -374,6 +375,13 @@
if-class CDATA #IMPLIED
parameters CDATA #IMPLIED>
+<!--
+ <display-in-lists> marks a field for display only in the select results for this table.
+ Fields which are <display> are also <display-in-lists>
+-->
+<!ELEMENT display-in-lists EMPTY>
+
+
<!ELEMENT no-display EMPTY>
<!ELEMENT no-hide EMPTY>
Modified: trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Field.xml.vm
===================================================================
--- trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Field.xml.vm 2009-06-24 16:50:01 UTC (rev 3847)
+++ trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Field.xml.vm 2009-07-02 08:12:41 UTC (rev 3848)
@@ -159,6 +159,10 @@
<display/>
#end
+#if( $field.isDisplayedInLists() )
+ <display-in-lists/>
+#end
+
#set( $node=$field )
#parse( "Case.xml.vm" )
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-06-24 16:50:01 UTC (rev 3847)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.java 2009-07-02 08:12:41 UTC (rev 3848)
@@ -765,7 +765,7 @@
}
if ( accessR != null ) hasPrefsInDB = true;
if ( getSessionUserAdmin().hasAccess( field.getId(), AccessRight.EDITABLE_ACCESS_VIEW ) &&
- ( accessR == AccessRight.TABLE_PREFERENCE_DISPLAY || ( accessR == null && field.isDisplayed() ) ) )
+ ( accessR == AccessRight.TABLE_PREFERENCE_DISPLAY || ( accessR == null && field.isDisplayedInLists() ) ) )
{
displayedFields.add( field );
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMField.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMField.java 2009-06-24 16:50:01 UTC (rev 3847)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMField.java 2009-07-02 08:12:41 UTC (rev 3848)
@@ -60,6 +60,7 @@
protected boolean calculated;
protected int inTag; // currently processed tag for appendData
protected boolean display; // show field in short reference to object?
+ protected boolean displayInLists; // show field in select results for this table?
protected String defaultType; // type of default: value, auto, class
protected List<String> tableTypes =
new ArrayList<String>(); // a list of types of tables to whom this field belongs
@@ -185,6 +186,10 @@
{
display = true;
}
+ else if ( tag.equals( "display-in-lists" ) )
+ {
+ displayInLists = true;
+ }
else if ( tag.equals( "immutable-if" ) )
{
if ( immutableIf == null ) immutableIf = new ArrayList<MutableIf>();
@@ -278,6 +283,11 @@
return display;
}
+ public boolean isDisplayedInLists()
+ {
+ return displayInLists;
+ }
+
// add a (part of) the default value. Can be java code for a calculation
public void appendData( CharSequence arg )
throws XMLTreeException
Modified: trunk/Uni-d/test/src/uni-d/xejb/CocoonMan.table
===================================================================
--- trunk/Uni-d/test/src/uni-d/xejb/CocoonMan.table 2009-06-24 16:50:01 UTC (rev 3847)
+++ trunk/Uni-d/test/src/uni-d/xejb/CocoonMan.table 2009-07-02 08:12:41 UTC (rev 3848)
@@ -12,8 +12,11 @@
<field name="LastName" type="string" length="15">
<display/>
<full-text-searchable/>
+ <is-reference/>
</field>
- <field name="DateOfBirth" type="date"/>
+ <field name="DateOfBirth" type="date">
+ <display-in-lists/>
+ </field>
<field name="Sometime" type="timestamp" renderer="time,display=hms"/>
<field name="Employed" type="boolean"/>
<field name="Height" type="double" length="10" display-length="5"/>
@@ -21,6 +24,7 @@
<field name="PreviousJobs" type="string" length="30">
<multiple/>
<full-text-searchable/>
+
</field>
<field name="DatesToRemember" type="date">
<multiple/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-06-24 16:50:21
|
Revision: 3847
http://uni-d.svn.sourceforge.net/uni-d/?rev=3847&view=rev
Author: max_brod
Date: 2009-06-24 16:50:01 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
No need to check duplicates here, values are ignored in mediators too.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.script
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.script
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.script 2009-06-02 15:01:18 UTC (rev 3846)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/input/unidMultipleField/UnidMultipleField.script 2009-06-24 16:50:01 UTC (rev 3847)
@@ -129,6 +129,6 @@
</unique>
</body>
<initialization>
- addValidationForElemId("${tableID}", checkMultipleFieldValueUniqueness, "${fieldID}", "${tableID}")
+ /* addValidationForElemId("${tableID}", checkMultipleFieldValueUniqueness, "${fieldID}", "${tableID}") */
</initialization>
</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-06-02 15:01:39
|
Revision: 3846
http://uni-d.svn.sourceforge.net/uni-d/?rev=3846&view=rev
Author: pushkutza
Date: 2009-06-02 15:01:18 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
tool fixes ... next fault with Alt+Down ... focut directly on the verified language label
Modified Paths:
--------------
trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/KeyEditorPanel.java
trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/TranslationsEditor.java
Modified: trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/KeyEditorPanel.java
===================================================================
--- trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/KeyEditorPanel.java 2009-06-02 13:13:19 UTC (rev 3845)
+++ trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/KeyEditorPanel.java 2009-06-02 15:01:18 UTC (rev 3846)
@@ -2,24 +2,24 @@
* This file is part of the Uni-d project.
* $Id$
*
- * 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.
+ * The contents of <code>this</code> file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use <code>this</code> 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
+ * Alternatively, the contents of <code>this</code> 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
+ * of those above. If you wish to allow use of your version of <code>this</code> 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
+ * use your version of <code>this</code> 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 provisions above, a recipient may use your version of <code>this</code> file under
* the terms of any one of the MPL, the GPL or the LGPL.
*/
@@ -60,7 +60,7 @@
GridBagConstraints constr = new GridBagConstraints( 0, 0, 1, 1, 1.0, 1.0
, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
- new Insets( 2, 2, 2, 2 ), 0, 0 );
+ new Insets( 2, 2, 2, 2 ), 0, 0 );
setLayout( new GridBagLayout() );
constr.weightx = 1.0;
@@ -69,7 +69,7 @@
add( context, constr );
translationsTextFields = new FastMap<String, JTextField[]>();
- for ( int i = 0; i < languages.length ; i++ )
+ for ( int i = 0 ; i < languages.length ; i++ )
{
constr.gridy++;
@@ -135,11 +135,20 @@
*/
}
+ public synchronized void focusTranslation( String[] langs )
+ {
+ if ( langs != null && langs.length > 0 )
+ {
+ JTextField label = translationsTextFields.get( langs[ 0 ] )[ 0 ];
+ if ( label != null ) label.requestFocus();
+ }
+ }
+
public synchronized void setCurrentKey( Key key, Map<String, Translation> translations )
{
this.key = key;
context.setText( key.getContext() );
- for ( int i = 0; i < languages.length ; i++ )
+ for ( int i = 0 ; i < languages.length ; i++ )
{
JTextField label = translationsTextFields.get( languages[ i ] )[ 0 ];
JTextField caption = translationsTextFields.get( languages[ i ] )[ 1 ];
@@ -155,7 +164,7 @@
{
if ( key == null ) return;
- for ( int i = 0; i < languages.length ; i++ )
+ for ( int i = 0 ; i < languages.length ; i++ )
{
JTextField label = translationsTextFields.get( languages[ i ] )[ 0 ];
JTextField caption = translationsTextFields.get( languages[ i ] )[ 1 ];
@@ -177,7 +186,7 @@
public synchronized void clear()
{
context.setText( "" );
- for ( int i = 0; i < languages.length ; i++ )
+ for ( int i = 0 ; i < languages.length ; i++ )
{
JTextField label = translationsTextFields.get( languages[ i ] )[ 0 ];
JTextField caption = translationsTextFields.get( languages[ i ] )[ 1 ];
Modified: trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/TranslationsEditor.java
===================================================================
--- trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/TranslationsEditor.java 2009-06-02 13:13:19 UTC (rev 3845)
+++ trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/TranslationsEditor.java 2009-06-02 15:01:18 UTC (rev 3846)
@@ -380,6 +380,9 @@
keysMenu.add( renameKeyItem );
keysMenu.add( deleteKeyItem );
+ saveItem.setAccelerator( KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_S,
+ java.awt.Event.CTRL_MASK ) );
+
addKeyItem.setAccelerator( KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_A,
java.awt.Event.ALT_MASK ) );
@@ -400,7 +403,7 @@
java.awt.Event.ALT_MASK ) );
searchTranslationItem.setAccelerator( KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_T,
java.awt.Event.ALT_MASK ) );
- nextFaultItem.setAccelerator( KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_F,
+ nextFaultItem.setAccelerator( KeyStroke.getKeyStroke( java.awt.event.KeyEvent.VK_DOWN,
java.awt.Event.ALT_MASK ) );
menuBar.add( generalMenu );
@@ -441,6 +444,8 @@
{
if ( !e.getValueIsAdjusting() )
{
+ keyEditorPanel.save();
+ savePreviousKey();
refreshForCurrentKey();
}
}
@@ -1081,6 +1086,8 @@
{
e.printStackTrace();
}
+
+ keyEditorPanel.focusTranslation( model.getVerifyLanguages() );
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-06-02 13:13:30
|
Revision: 3845
http://uni-d.svn.sourceforge.net/uni-d/?rev=3845&view=rev
Author: pushkutza
Date: 2009-06-02 13:13:19 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
some fixes
Modified Paths:
--------------
trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/KeyEditorPanel.java
trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/TranslationsEditor.java
Modified: trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/KeyEditorPanel.java
===================================================================
--- trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/KeyEditorPanel.java 2009-06-02 10:07:33 UTC (rev 3844)
+++ trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/KeyEditorPanel.java 2009-06-02 13:13:19 UTC (rev 3845)
@@ -135,7 +135,7 @@
*/
}
- public void setCurrentKey( Key key, Map<String, Translation> translations )
+ public synchronized void setCurrentKey( Key key, Map<String, Translation> translations )
{
this.key = key;
context.setText( key.getContext() );
@@ -151,7 +151,7 @@
}
}
- public void save()
+ public synchronized void save()
{
if ( key == null ) return;
@@ -174,7 +174,7 @@
/**
* Clear the fields. Useful when the last key was removed from the table and there's no other to update the fields.
*/
- public void clear()
+ public synchronized void clear()
{
context.setText( "" );
for ( int i = 0; i < languages.length ; i++ )
Modified: trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/TranslationsEditor.java
===================================================================
--- trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/TranslationsEditor.java 2009-06-02 10:07:33 UTC (rev 3844)
+++ trunk/Uni-d/tool/src/main/java/be/unid/tool/translationsEditor/TranslationsEditor.java 2009-06-02 13:13:19 UTC (rev 3845)
@@ -2,24 +2,24 @@
* This file is part of the Uni-d project.
* $Id$
*
- * 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.
+ * The contents of <code>this</code> file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use <code>this</code> 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
+ * Alternatively, the contents of <code>this</code> 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
+ * of those above. If you wish to allow use of your version of <code>this</code> 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
+ * use your version of <code>this</code> 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 provisions above, a recipient may use your version of <code>this</code> file under
* the terms of any one of the MPL, the GPL or the LGPL.
*/
@@ -568,7 +568,7 @@
if ( newKeyName != null && !newKeyName.equals( "" ) )
{
Key keyAdd;
- for ( int i = 0; i < modelInfo.getRowCount() ; i++ )
+ for ( int i = 0 ; i < modelInfo.getRowCount() ; i++ )
{
keyAdd = modelInfo.getKeyAtIndex( i );
if ( keyAdd.getKey().equals( key.getKey() ) )
@@ -593,7 +593,7 @@
if ( lastTranslationSearched == null || lastTranslationSearched.equals( "" ) ) return;
int start = table.getSelectedRow() + 1;
- for ( int i = start; i < model.getRowCount() ; i++ )
+ for ( int i = start ; i < model.getRowCount() ; i++ )
{
Map<String, Translation> translations = model.getTranslation( model.getKeyAtIndex( i ) );
if ( translations == null ) continue;
@@ -622,7 +622,7 @@
if ( lastKeySearched == null || lastKeySearched.equals( "" ) ) return;
int start = table.getSelectedRow() + 1;
- for ( int i = start; i < model.getRowCount() ; i++ )
+ for ( int i = start ; i < model.getRowCount() ; i++ )
{
Key key = model.getKeyAtIndex( i );
if ( key.getKey().contains( lastKeySearched ) )
@@ -636,7 +636,7 @@
private void gotoNextFault()
{
int start = table.getSelectedRow() + 1;
- for ( int i = start; i < model.getRowCount() ; i++ )
+ for ( int i = start ; i < model.getRowCount() ; i++ )
{
if ( model.isFaulty( i ) )
{
@@ -705,16 +705,19 @@
{
System.out.print( "Loading translations flter ..." );
-
+ if ( keySearch1 != null && keySearch1.equals( "" ) ) keySearch1 = null;
+ if ( keySearch2 != null && keySearch2.equals( "" ) ) keySearch2 = null;
model.setVerifyLanguages( modelInfo.getVerifyLanguages() );
Map<Key, FastMap<String, Translation>> all = modelInfo.getTranslations();
for ( Key k : all.keySet() )
{
+
FastMap<String, Translation> trans = all.get( k );
boolean isGood = false;
- if ( keySearch1 != null && keySearch2 == null && k.getKey().startsWith( keySearch1 ) )
+ if ( keySearch1 == null && keySearch2 == null ) isGood = true;
+ if ( keySearch1 != null && keySearch2 == null && k.getKey().contains( keySearch1 ) )
{
isGood = true;
}
@@ -770,7 +773,7 @@
int globalRow1 = -1;
int globalRow2 = -1;
- for ( int i = 0; i < modelInfo.getRowCount() ; i++ )
+ for ( int i = 0 ; i < modelInfo.getRowCount() ; i++ )
{
Key temp = modelInfo.getKeyAtIndex( i );
if ( temp.getKey().equals( key.getKey() ) )
@@ -821,7 +824,7 @@
database = (OMDatabase) doc.getChildNodes().item( 0 ).getChildNodes().item( 0 );
}
NodeList tables = database.getNodesByTagName( "root-table" );
- for ( int t = 0; t < tables.getLength() ; t++ )
+ for ( int t = 0 ; t < tables.getLength() ; t++ )
{
OMRootTable table = (OMRootTable) tables.item( t );
if ( table.isNoTranslation() ) continue;
@@ -830,8 +833,8 @@
for ( OMRootTable.TableType type : table.getTypes() )
{
- OMTable subtable=table.getTable( type.getName());
- if (subtable.isNoTranslation()) continue;
+ OMTable subtable = table.getTable( type.getName() );
+ if ( subtable.isNoTranslation() ) continue;
importDbKey( "type." + table.getName() + "." + type.getName(), type.getName(), dbItems,
addToModel );
}
@@ -989,7 +992,7 @@
writer.write( ";Last edited: " + new Date( System.currentTimeMillis() ) + '\n' );
TextBuilder line = TextBuilder.newInstance();
line.append( ".languages " );
- for ( int i = 0; i < languages.length ; i++ )
+ for ( int i = 0 ; i < languages.length ; i++ )
{
if ( i > 0 ) line.append( ';' );
line.append( languages[ i ] );
@@ -997,7 +1000,7 @@
line.append( '\n' );
writer.write( line.toString() );
- for ( int i = 0; i < modelInfo.getRowCount() ; i++ )
+ for ( int i = 0 ; i < modelInfo.getRowCount() ; i++ )
{
Key key = modelInfo.getKeyAtIndex( i );
if ( !key.getKey().equals( lastKey ) || !key.getContext().equals( lastContext ) )
@@ -1008,7 +1011,6 @@
line.append( ".key " );
-
line.append( key.getKey() );
if ( key.getContext() != null && key.getContext().length() > 0 )
{
@@ -1043,7 +1045,6 @@
}
}
-
private void writeTranslationToFile( BufferedWriter writer, TextBuilder line, String language, String tag,
String translation )
throws IOException
@@ -1100,7 +1101,7 @@
java.util.List<String> currentDbKeys = importDbContent( false );
int countUnused = 0;
- for ( int i = model.getRowCount() - 1; i >= 0 ; i-- )
+ for ( int i = model.getRowCount() - 1 ; i >= 0 ; i-- )
{
Key key = model.getKeyAtIndex( i );
@@ -1111,7 +1112,7 @@
countUnused++;
}
}
- for ( int i = modelInfo.getRowCount() - 1; i >= 0 ; i-- )
+ for ( int i = modelInfo.getRowCount() - 1 ; i >= 0 ; i-- )
{
Key key = modelInfo.getKeyAtIndex( i );
@@ -1163,7 +1164,7 @@
int ret = fc.showOpenDialog( this );
if ( ret != JFileChooser.APPROVE_OPTION ) return;
- for ( int i = 0; i < languages.length ; i++ )
+ for ( int i = 0 ; i < languages.length ; i++ )
{
String filePath = fc.getSelectedFile().getAbsolutePath() + "/" + context;
if ( i > 0 ) filePath += '_' + languages[ i ];
@@ -1219,7 +1220,7 @@
JOptionPane.showInputDialog( TranslationsEditor.this, "Enter context name", currentContext );
if ( context == null || context.length() == 0 ) return;
- for ( int i = model.getKeys().size() - 1; i >= 0 ; i-- )
+ for ( int i = model.getKeys().size() - 1 ; i >= 0 ; i-- )
{
Key key = model.getKeyAtIndex( i );
if ( context.equals( key.getContext() ) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-06-02 10:07:41
|
Revision: 3844
http://uni-d.svn.sourceforge.net/uni-d/?rev=3844&view=rev
Author: max_brod
Date: 2009-06-02 10:07:33 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
[ICT-1620]
Removing a record will always go to the TableManager page of that table.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/shared/AddViewEditManipulation.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/shared/AddViewEditManipulation.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/shared/AddViewEditManipulation.java 2009-06-01 17:05:33 UTC (rev 3843)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/shared/AddViewEditManipulation.java 2009-06-02 10:07:33 UTC (rev 3844)
@@ -29,6 +29,9 @@
import be.unid.tapestry.navigation.*;
import be.unid.tapestry.pages.edit.EditPage;
import be.unid.tapestry.pages.view.ViewPage;
+import be.unid.tapestry.pages.tableManager.TableManagerPage;
+import be.unid.tapestry.pages.select.SelectPage;
+import be.unid.tapestry.pages.add.AddPage;
import be.unid.tapestry.util.UnidProxyAccessor;
/**
@@ -220,37 +223,45 @@
public static synchronized void remove( NavigationablePage navPage )
throws Exception
{
- if ( navPage.getPageParameters() instanceof HasProxyParameter )
+ if ( navPage.getPageParameters() instanceof AddViewEditPageParameters )
{
- HasProxyParameter pageParams = (HasProxyParameter) navPage.getPageParameters();
+ AddViewEditPageParameters pageParams = (AddViewEditPageParameters) navPage.getPageParameters();
// remove proxy
pageParams.getProxy().removeEntityBean();
pageParams.setProxy( null );
- }
- // force refresh the proxy in the view/edit page after this change
- NavigationManager nm = navPage.getNavigationManager();
- if ( nm.hasReturnPage( navPage ) )
- {
- NavigationablePage returnPage = nm.getReturnPage( navPage );
- if ( returnPage.getPageParameters() instanceof HasProxyParameter &&
- ( returnPage instanceof ViewPage || returnPage instanceof EditPage ) )
+
+ NavigationManager nm = navPage.getNavigationManager();
+
+ boolean isReturnPage = false;
+ NavigationablePage returnPage = navPage;
+
+ if ( nm.hasReturnPage( navPage ) )
{
- HasProxyParameter pageParams = (HasProxyParameter) returnPage.getPageParameters();
- if ( pageParams.getProxy() != null )
+ isReturnPage = true;
+ returnPage = nm.getReturnPage( navPage );
+ if ( returnPage.getPageParameters() instanceof HasProxyParameter &&
+ ( returnPage instanceof ViewPage || returnPage instanceof EditPage ) )
{
- String tableName = UnidProxyAccessor.getTableName( pageParams.getProxy() );
- UnidProxy proxy = UnidProxyAccessor.findUoid( tableName, pageParams.getProxy().getUOID().getId() );
- pageParams.setProxy( proxy );
+ if ( pageParams.getProxy() != null )
+ {
+ String tableName = UnidProxyAccessor.getTableName( pageParams.getProxy() );
+ UnidProxy proxy =
+ UnidProxyAccessor.findUoid( tableName, pageParams.getProxy().getUOID().getId() );
+ pageParams.setProxy( proxy );
+ }
}
+ returnPage.getPageParameters().clearReturnHandler();
+ nm.returnTo( returnPage, navPage.getPageParameters() );
}
- returnPage.getPageParameters().clearReturnHandler();
- nm.returnTo( returnPage, navPage.getPageParameters() );
+ // if we have nowehere to return, go to table manager page of that table
+ TableManagerPage page =
+ (TableManagerPage) nm.getForwardPage( returnPage, "TableManagerPage", isReturnPage );
+ page.getPageParameters().setTableName( pageParams.getTableName() );
+ page.getPageParameters().setShowSelect( pageParams.isShowSelect() );
+ nm.forward( page );
}
- else
- {
- gotoView( navPage, null, null, false );
- }
+
}
public static synchronized void doClone( NavigationablePage navPage, UnidProxy proxy, String tablenName )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-06-01 17:05:42
|
Revision: 3843
http://uni-d.svn.sourceforge.net/uni-d/?rev=3843&view=rev
Author: max_brod
Date: 2009-06-01 17:05:33 +0000 (Mon, 01 Jun 2009)
Log Message:
-----------
[ICT-1620,ICT-1621]
Hidden parents of an element should be searched in more depth.
Some improvement for speed: if a hidden parent for an element is found, skip the next children of that parent faster ( without checking again all the classes of all its successive parents).
Change for the attachment fields, they are skipped by tab/enter.
Modified Paths:
--------------
trunk/Uni-d/template/src/main/webapp/FormScript.js
Modified: trunk/Uni-d/template/src/main/webapp/FormScript.js
===================================================================
--- trunk/Uni-d/template/src/main/webapp/FormScript.js 2009-05-22 14:34:52 UTC (rev 3842)
+++ trunk/Uni-d/template/src/main/webapp/FormScript.js 2009-06-01 17:05:33 UTC (rev 3843)
@@ -1,7 +1,9 @@
var SUBMIT_CLASS = "submitButton";
var SKIP_FIELD_CLASS = "skipField";
var lastKeyTime = null;
-var MAX_DEPTH_CHECK_VISIBILITY = 10;
+var lastHiddenParent=null;
+
+var MAX_DEPTH_CHECK_VISIBILITY = 12;
// check so many parents to be visible
function getStyleClass( element )
@@ -88,8 +90,16 @@
{
if ( classes.indexOf(" ") == -1 )
{
- if ( classDisplayNone(classes) == true ) return false;
- if ( classes == SKIP_FIELD_CLASS ) return false;
+ if ( classDisplayNone(classes) == true )
+ {
+ lastHiddenParent=element;
+ return false;
+ }
+ if ( classes == SKIP_FIELD_CLASS )
+ {
+ lastHiddenParent=element;
+ return false;
+ }
break;
}
else
@@ -97,7 +107,11 @@
var className = classes.substring(0, classes.indexOf(" "));
if (className!="tabset_content" )
{
- if ( classDisplayNone(className)==true ) return false;
+ if ( classDisplayNone(className)==true )
+ {
+ lastHiddenParent=element;
+ return false;
+ }
}
classes = classes.substring(classes.indexOf(" ") + 1);
}
@@ -108,9 +122,24 @@
return true;
}
+function isParent(parent, child)
+{
+ depth = MAX_DEPTH_CHECK_VISIBILITY;
+ element=child;
+ while ( depth > 0 && element!= null && element.tagName != "FORM" )
+ {
+ if (element==parent) return true;
+ depth--;
+ element = element.parentNode;
+ }
+ return false;
+
+}
+
function NetscapeKeyHandler( input, event )
{
lastKeyTime = new Date();
+ lastHiddenParent=null;
if ( input.form )
{
if ( event.which == 13 && event.ctrlKey )
@@ -158,10 +187,14 @@
if ( pos == -1 ) pos = input.form.length - 1;
while ( 1 == 1 )
{
- if ( !input.form[ pos ].type )
+ if ( lastHiddenParent!=null && isParent(lastHiddenParent, input.form[pos]) )
+ pos+=direction;
+ else if ( !input.form[ pos ].type )
pos += direction;
else if ( input.form[ pos ].type == "hidden" )
pos += direction;
+ else if ( input.form[ pos ].type == "file" )
+ pos += direction;
else if ( input.form[ pos ].disabled == true )
pos += direction;
else if ( input.form[ pos ].disabled == "disabled" )
@@ -175,8 +208,9 @@
if ( pos == input.form.length ) pos = 0;
if ( pos == -1 ) pos = input.form.length - 1;
}
+ // if ( input.form[ pos ].type == "file" ) return true;
input.form[ pos ].focus();
- return false;
+ return false;
}
}
return true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-22 14:35:02
|
Revision: 3842
http://uni-d.svn.sourceforge.net/uni-d/?rev=3842&view=rev
Author: max_brod
Date: 2009-05-22 14:34:52 +0000 (Fri, 22 May 2009)
Log Message:
-----------
Cut off "Group" from groups translations.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidGroup/UnidGroup.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidGroup/UnidGroup.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidGroup/UnidGroup.java 2009-05-22 09:40:10 UTC (rev 3841)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/unidGroup/UnidGroup.java 2009-05-22 14:34:52 UTC (rev 3842)
@@ -210,9 +210,8 @@
public String getGroupLabel( GMGroup group )
{
return group.getName().equals( "" )
- ? null
- : getMessages().getMessage( "Group" ) + " " +
- getMessages().getMessage( "group." + getTableName() + '.' + group.getName() + ".label" );
+ ? ""
+ : getMessages().getMessage( "group." + getTableName() + '.' + group.getName() + ".label" );
}
public String getGroupFieldsetId( GMGroup group )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-05-22 09:40:26
|
Revision: 3841
http://uni-d.svn.sourceforge.net/uni-d/?rev=3841&view=rev
Author: pushkutza
Date: 2009-05-22 09:40:10 +0000 (Fri, 22 May 2009)
Log Message:
-----------
reformating
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItemsList.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/TapestryHome.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminMenu/AdminMenu.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/userMenu/UserMenu.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/Parser.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/selectionModel/StartPageSelectionModel.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/Visit.java
Added Paths:
-----------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescription.java
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItems.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -35,6 +35,7 @@
import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.parser.border.Parser;
import be.unid.tapestry.parser.border.BorderItemTranslator;
+import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.pool.Pool;
import be.unid.tapestry.validation.HideIf;
@@ -100,7 +101,7 @@
*
* @param item
*/
- private ItemDescription calculateItem( Parser.ItemDescription item )
+ private BorderItemDescription calculateItem( ItemDescription item )
{
if ( !isValid( item.getValidator(), item.getValidatorParameters() ) ) return null;
if ( !getSessionUserAdmin().hasAccess( item.getUserAdminId(), AccessRight.TABLE_PREFERENCE_DISPLAY ) )
@@ -123,10 +124,10 @@
}
if ( translation == null ) translation = getMessages().getMessage( item.getKey() );
translation = translation.replace( "\'", "'" );
- List<ItemDescription> children = new ArrayList<ItemDescription>();
- for ( Parser.ItemDescription child : item.getItems() )
+ List<BorderItemDescription> children = new ArrayList<BorderItemDescription>();
+ for ( ItemDescription child : item.getItems() )
{
- ItemDescription calculatedChild = calculateItem( child );
+ BorderItemDescription calculatedChild = calculateItem( child );
if ( calculatedChild != null ) children.add( calculatedChild );
}
if ( item.getChildItems() != null && !item.getChildItems().equals( "" ) )
@@ -147,25 +148,25 @@
"javascript: field=document.getElementById(\"borderHiddenField1Id\"); field.value=\"" +
rep[ 1 ] +
"\"; field=document.getElementById(\"borderHiddenField2Id\"); field.value=\"report\"; field.parentNode.submit(); ";
- children.add( new ItemDescription( rep[ 0 ], item.getIcon(),
+ children.add( new BorderItemDescription( rep[ 0 ], item.getIcon(),
pageStr,
null,
- new ArrayList<ItemDescription>() ) );
+ new ArrayList<BorderItemDescription>() ) );
}
}
}
}
}
- return new ItemDescription( translation, item.getIcon(), item.getPage(), item.getTranslatorClass(), children );
+ return new BorderItemDescription( translation, item.getIcon(), item.getPage(), item.getTranslatorClass(), children );
}
public List getItems()
{
- List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
- ArrayList<ItemDescription> calculatedItems = new ArrayList<ItemDescription>();
- for ( Parser.ItemDescription item : items )
+ List<ItemDescription> items = getVisitObject().getBorderItems();
+ ArrayList<BorderItemDescription> calculatedItems = new ArrayList<BorderItemDescription>();
+ for ( ItemDescription item : items )
{
- ItemDescription calculatedItem = calculateItem( item );
+ BorderItemDescription calculatedItem = calculateItem( item );
if ( calculatedItem != null )
{
calculatedItems.add( calculatedItem );
@@ -432,16 +433,16 @@
}
}
- class ItemDescription
+ class BorderItemDescription
{
String key;
String icon;
String page;
- List<ItemDescription> items;
+ List<BorderItemDescription> items;
String translationClass;
- public ItemDescription( String key, String icon, String page, String translationClass,
- List<ItemDescription> items )
+ public BorderItemDescription( String key, String icon, String page, String translationClass,
+ List<BorderItemDescription> items )
{
this.key = key;
this.icon = icon;
@@ -450,7 +451,7 @@
this.translationClass = translationClass;
}
- public ItemDescription()
+ public BorderItemDescription()
{
}
@@ -484,12 +485,12 @@
this.page = page;
}
- public List<ItemDescription> getItems()
+ public List<BorderItemDescription> getItems()
{
return items;
}
- public void setItems( List<ItemDescription> items )
+ public void setItems( List<BorderItemDescription> items )
{
this.items = items;
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItemsList.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItemsList.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/borderItems/BorderItemsList.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -31,6 +31,7 @@
import org.apache.tapestry.annotations.Asset;
import org.apache.tapestry.IAsset;
import be.unid.tapestry.parser.border.Parser;
+import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.tapestry.rights.AccessRight;
import be.unid.tapestry.navigation.NavigationablePage;
import be.unid.tapestry.components.UnidBaseComponent;
@@ -59,9 +60,9 @@
@Asset( value = "/be/unid/tapestry/components/borderItems/BorderItemsList.html" )
public abstract IAsset get$template();
- public abstract Parser.ItemDescription getValue();
+ public abstract ItemDescription getValue();
- public abstract void setValue( Parser.ItemDescription value );
+ public abstract void setValue( ItemDescription value );
public String getKey()
{
@@ -135,13 +136,13 @@
public List getItems()
{
- List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
- ArrayList<Parser.ItemDescription> calculatedItems = new ArrayList<Parser.ItemDescription>();
- for ( Parser.ItemDescription item : items )
+ List<ItemDescription> items = getVisitObject().getBorderItems();
+ ArrayList<ItemDescription> calculatedItems = new ArrayList<ItemDescription>();
+ for ( ItemDescription item : items )
{
if ( item.getKey().equals( getItemKey() ) )
{
- for ( Parser.ItemDescription subItem : item.getItems() )
+ for ( ItemDescription subItem : item.getItems() )
{
if ( isVisible( subItem ) )
{
@@ -153,7 +154,7 @@
return calculatedItems;
}
- private boolean isVisible( Parser.ItemDescription item )
+ private boolean isVisible( ItemDescription item )
{
if ( !isValid( item.getValidator(), item.getValidatorParameters() ) ) return false;
if ( !getSessionUserAdmin().hasAccess( item.getUserAdminId(), AccessRight.TABLE_PREFERENCE_DISPLAY ) )
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/TapestryHome.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/TapestryHome.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/TapestryHome.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -27,6 +27,7 @@
import be.unid.persistence.om.UnidProxy;
import be.unid.tapestry.parser.border.Parser;
+import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.tapestry.util.UnidProxyAccessor;
import org.apache.tapestry.RedirectException;
import org.apache.tapestry.event.PageBeginRenderListener;
@@ -65,14 +66,14 @@
{
throw new RedirectException( "app?service=page&page=DefaultHome" );
}
- List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
- for ( Parser.ItemDescription item : items )
+ List<ItemDescription> items = getVisitObject().getBorderItems();
+ for ( ItemDescription item : items )
{
if ( startPage.equals( item.getKey() ) )
{
throw new RedirectException( item.getPage() );
}
- for ( Parser.ItemDescription subItem : item.getItems() )
+ for ( ItemDescription subItem : item.getItems() )
{
if ( startPage.equals( subItem.getKey() ) )
{
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -28,6 +28,7 @@
import be.unid.tapestry.navigation.NavigationablePageImpl;
import be.unid.tapestry.parser.border.Parser;
import be.unid.tapestry.parser.border.ItemDescriptionEx;
+import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.tapestry.pool.Pool;
import be.unid.tapestry.components.shared.DescriptionFactory;
import be.unid.tapestry.components.shared.ConfigurationKeys;
@@ -54,60 +55,60 @@
{
protected static final Logger log = Logger.getLogger( AdminBorderConfig.class );
- private void addNames( Parser.ItemDescription item, ArrayList<String> names )
+ private void addNames( ItemDescription item, ArrayList<String> names )
{
if ( !isValid( item.getValidator(), item.getValidatorParameters() ) ) return;
if ( "cbSplit".equals( item.getUserAdminId() ) ) return;
names.add( item.getUserAdminId() );
- for ( Parser.ItemDescription child : item.getItems() )
+ for ( ItemDescription child : item.getItems() )
{
addNames( child, names );
}
if ( item.getPage() != null && item.getPage().contains( "TablesIndex" ) )
{
- ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
- for ( Parser.ItemDescription child : newitems ) addNames( child, names );
+ ArrayList<ItemDescription> newitems = buildTableCategories();
+ for ( ItemDescription child : newitems ) addNames( child, names );
}
}
- private void addLabels( Parser.ItemDescription item, ArrayList<String> labels )
+ private void addLabels( ItemDescription item, ArrayList<String> labels )
{
if ( !isValid( item.getValidator(), item.getValidatorParameters() ) ) return;
if ( "cbSplit".equals( item.getUserAdminId() ) ) return;
labels.add( getMessages().getMessage( item.getKey() ) );
- for ( Parser.ItemDescription child : item.getItems() )
+ for ( ItemDescription child : item.getItems() )
{
addLabels( child, labels );
}
if ( item.getPage() != null && item.getPage().contains( "TablesIndex" ) )
{
- ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
- for ( Parser.ItemDescription child : newitems ) addLabels( child, labels );
+ ArrayList<ItemDescription> newitems = buildTableCategories();
+ for ( ItemDescription child : newitems ) addLabels( child, labels );
}
}
- private void addOffsets( Parser.ItemDescription item, ArrayList<Integer> offsets, int startoffset )
+ private void addOffsets( ItemDescription item, ArrayList<Integer> offsets, int startoffset )
{
if ( !isValid( item.getValidator(), item.getValidatorParameters() ) ) return;
if ( "cbSplit".equals( item.getUserAdminId() ) ) return;
offsets.add( calculateOffset( item ) + startoffset );
- for ( Parser.ItemDescription child : item.getItems() )
+ for ( ItemDescription child : item.getItems() )
{
addOffsets( child, offsets, 0 );
}
if ( item.getPage() != null && item.getPage().contains( "TablesIndex" ) )
{
int start = calculateOffset( item );
- ArrayList<Parser.ItemDescription> newitems = buildTableCategories();
- for ( Parser.ItemDescription child : newitems ) addOffsets( child, offsets, start );
+ ArrayList<ItemDescription> newitems = buildTableCategories();
+ for ( ItemDescription child : newitems ) addOffsets( child, offsets, start );
}
}
- private Integer calculateOffset( Parser.ItemDescription item )
+ private Integer calculateOffset( ItemDescription item )
{
int i = 0;
- Parser.ItemDescription totest = item;
+ ItemDescription totest = item;
while ( totest != null )
{
i++;
@@ -147,9 +148,9 @@
public ArrayList<String> getNames()
{
- List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
+ List<ItemDescription> items = getVisitObject().getBorderItems();
ArrayList<String> names = new ArrayList<String>();
- for ( Parser.ItemDescription item : items )
+ for ( ItemDescription item : items )
{
addNames( item, names );
}
@@ -163,9 +164,9 @@
*/
public ArrayList<String> getLabels()
{
- List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
+ List<ItemDescription> items = getVisitObject().getBorderItems();
ArrayList<String> labels = new ArrayList<String>();
- for ( Parser.ItemDescription item : items )
+ for ( ItemDescription item : items )
{
addLabels( item, labels );
}
@@ -179,9 +180,9 @@
public ArrayList<Integer> getOffsets()
{
- List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
+ List<ItemDescription> items = getVisitObject().getBorderItems();
ArrayList<Integer> offsets = new ArrayList<Integer>();
- for ( Parser.ItemDescription item : items )
+ for ( ItemDescription item : items )
{
addOffsets( item, offsets, 0 );
}
@@ -210,25 +211,25 @@
return true;
}
- ArrayList<Parser.ItemDescription> list = new ArrayList<Parser.ItemDescription>();
+ ArrayList<ItemDescription> list = new ArrayList<ItemDescription>();
@Override
public void attach( IEngine iEngine, IRequestCycle iRequestCycle )
{
super.attach( iEngine, iRequestCycle );
- list = new ArrayList<Parser.ItemDescription>();
+ list = new ArrayList<ItemDescription>();
}
- public ArrayList<Parser.ItemDescription> buildTableCategories( /*Parser.ItemDescription parent*/ )
+ public ArrayList<ItemDescription> buildTableCategories( /*ItemDescription parent*/ )
{
if ( list != null && list.size() > 0 ) return list;
- list = new ArrayList<Parser.ItemDescription>();
+ list = new ArrayList<ItemDescription>();
Map<String, ArrayList<String>> categories = DescriptionFactory.getCategories();
for ( String category : categories.keySet() )
{
if ( !getSessionUserAdmin().hasTablePreferenceDisplay( "tc" + category ) ) continue;
if ( !getSessionUserAdmin().hasAccess( "tc" + category, AccessRight.TABLE_PREFERENCE_DISPLAY ) ) continue;
- Parser.ItemDescription item = new ItemDescriptionEx();
+ ItemDescription item = new ItemDescriptionEx();
item.setKey( "category." + category + ".label" );
item.setUserAdminId( "tc" + category );
//item.setParent( parent );
@@ -259,7 +260,7 @@
// String label = getMessages().getMessage( "table." + table + ".label" );
// label = label.replace( "\'", "'" );
// calculatedTables.add( new String[]{ label, table, gmTable.getDisplayIndex() } );
- // Parser.ItemDescription itemTable = new ItemDescriptionEx();
+ // ItemDescription itemTable = new ItemDescriptionEx();
// itemTable.setKey( "table." + table + ".label" );
// itemTable.setUserAdminId( "t" + table );
// itemTable.setParent( item );
@@ -267,9 +268,9 @@
// System.out.println( "add table : " + table + " in cat " + category );
//}
}
- Collections.sort( list, new Comparator<Parser.ItemDescription>()
+ Collections.sort( list, new Comparator<ItemDescription>()
{
- public int compare( Parser.ItemDescription o1, Parser.ItemDescription o2 )
+ public int compare( ItemDescription o1, ItemDescription o2 )
{
if ( o1 == null )
{
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminMenu/AdminMenu.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminMenu/AdminMenu.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/adminMenu/AdminMenu.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -40,6 +40,7 @@
import be.unid.tapestry.model.GMTable;
import be.unid.tapestry.pool.Pool;
import be.unid.tapestry.parser.border.Parser;
+import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.tapestry.validation.HideIf;
import be.unid.validation.SimpleValidator;
import be.unid.persistence.om.UnidProxy;
@@ -184,9 +185,9 @@
return getMessages().getMessage( "table." + getTableName() + ".label" );
}
- public abstract Parser.ItemDescription getExtraItem();
+ public abstract ItemDescription getExtraItem();
- public abstract void setExtraItem( Parser.ItemDescription item );
+ public abstract void setExtraItem( ItemDescription item );
public String getExtraItemPage()
{
@@ -213,13 +214,13 @@
return true;
}
- public List<Parser.ItemDescription> getExtraItems()
+ public List<ItemDescription> getExtraItems()
{
try
{
Parser parser = new Parser( "extraAdminMenuItems.xml" );
- List<Parser.ItemDescription> items = new ArrayList<Parser.ItemDescription>();
- for ( Parser.ItemDescription item : parser.getItems() )
+ List<ItemDescription> items = new ArrayList<ItemDescription>();
+ for ( ItemDescription item : parser.getItems() )
{
if ( isValid( item.getValidator(), item.getValidatorParameters() ) ) items.add( item );
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/userMenu/UserMenu.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/userMenu/UserMenu.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/userAdmin/userMenu/UserMenu.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -38,6 +38,7 @@
import be.unid.tapestry.model.GMTable;
import be.unid.tapestry.pool.Pool;
import be.unid.tapestry.parser.border.Parser;
+import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.tapestry.validation.HideIf;
import be.unid.validation.SimpleValidator;
import org.apache.tapestry.IRequestCycle;
@@ -147,9 +148,9 @@
return getMessages().getMessage( "title" );
}
- public abstract Parser.ItemDescription getExtraItem();
+ public abstract ItemDescription getExtraItem();
- public abstract void setExtraItem( Parser.ItemDescription item );
+ public abstract void setExtraItem( ItemDescription item );
public String getExtraItemPage()
{
@@ -176,13 +177,13 @@
return true;
}
- public List<Parser.ItemDescription> getExtraItems()
+ public List<ItemDescription> getExtraItems()
{
try
{
Parser parser = new Parser( "extraUserMenuItems.xml" );
- List<Parser.ItemDescription> items = new ArrayList<Parser.ItemDescription>();
- for ( Parser.ItemDescription item : parser.getItems() )
+ List<ItemDescription> items = new ArrayList<ItemDescription>();
+ for ( ItemDescription item : parser.getItems() )
{
if ( isValid( item.getValidator(), item.getValidatorParameters() ) ) items.add( item );
}
Added: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescription.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescription.java (rev 0)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescription.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -0,0 +1,124 @@
+package be.unid.tapestry.parser.border;
+
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * Description!!!
+ *
+ * @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
+ * @version $Revision$
+ */
+public class ItemDescription
+{
+ public String getPage()
+ {
+ return page;
+ }
+
+ public void setPage( String page )
+ {
+ this.page = page;
+ }
+
+ public String getIcon()
+ {
+ return icon;
+ }
+
+ public void setIcon( String icon )
+ {
+ this.icon = icon;
+ }
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public void setKey( String key )
+ {
+ this.key = key;
+ }
+
+ public String getUserAdminId()
+ {
+ return userAdminId;
+ }
+
+ public void setUserAdminId( String userAdminId )
+ {
+ this.userAdminId = userAdminId;
+ }
+
+ public String getValidator()
+ {
+ return validator;
+ }
+
+ public void setValidator( String validator )
+ {
+ this.validator = validator;
+ }
+
+ public String getValidatorParameters()
+ {
+ return validatorParameters;
+ }
+
+ public void setValidatorParameters( String validatorParameters )
+ {
+ this.validatorParameters = validatorParameters;
+ }
+
+ public List<ItemDescription> getItems()
+ {
+ return items;
+ }
+
+ public void setItems( List<ItemDescription> items )
+ {
+ this.items = items;
+ }
+
+ public String getTranslatorClass()
+ {
+ return translatorClass;
+ }
+
+ public void setTranslatorClass( String translatorClass )
+ {
+ this.translatorClass = translatorClass;
+ }
+
+ public String getChildItems()
+ {
+ return childItems;
+ }
+
+ public void setChildItems( String childItems )
+ {
+ this.childItems = childItems;
+ }
+
+ public ItemDescription getParent()
+ {
+ return parent;
+ }
+
+ public void setParent( ItemDescription parent )
+ {
+ this.parent = parent;
+ }
+
+ private String page;
+ private String icon;
+ private String key;
+ private String childItems;
+ private String userAdminId;
+ private String validator;
+ private String validatorParameters;
+ private String translatorClass;
+ private ItemDescription parent;
+ private List<ItemDescription> items = new ArrayList<ItemDescription>();
+}
\ No newline at end of file
Property changes on: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescription.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/ItemDescriptionEx.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -7,6 +7,6 @@
* @version $Revision$
*/
public class ItemDescriptionEx
- extends Parser.ItemDescription
+ extends ItemDescription
{
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/Parser.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/Parser.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/parser/border/Parser.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -150,120 +150,6 @@
}
}
- public static class ItemDescription
- {
- public String getPage()
- {
- return page;
- }
-
- public void setPage( String page )
- {
- this.page = page;
- }
-
- public String getIcon()
- {
- return icon;
- }
-
- public void setIcon( String icon )
- {
- this.icon = icon;
- }
-
- public String getKey()
- {
- return key;
- }
-
- public void setKey( String key )
- {
- this.key = key;
- }
-
- public String getUserAdminId()
- {
- return userAdminId;
- }
-
- public void setUserAdminId( String userAdminId )
- {
- this.userAdminId = userAdminId;
- }
-
- public String getValidator()
- {
- return validator;
- }
-
- public void setValidator( String validator )
- {
- this.validator = validator;
- }
-
- public String getValidatorParameters()
- {
- return validatorParameters;
- }
-
- public void setValidatorParameters( String validatorParameters )
- {
- this.validatorParameters = validatorParameters;
- }
-
- public List<ItemDescription> getItems()
- {
- return items;
- }
-
- public void setItems( List<ItemDescription> items )
- {
- this.items = items;
- }
-
- public String getTranslatorClass()
- {
- return translatorClass;
- }
-
- public void setTranslatorClass( String translatorClass )
- {
- this.translatorClass = translatorClass;
- }
-
- public String getChildItems()
- {
- return childItems;
- }
-
- public void setChildItems( String childItems )
- {
- this.childItems = childItems;
- }
-
- public ItemDescription getParent()
- {
- return parent;
- }
-
- public void setParent( ItemDescription parent )
- {
- this.parent = parent;
- }
-
- private String page;
- private String icon;
- private String key;
- private String childItems;
- private String userAdminId;
- private String validator;
- private String validatorParameters;
- private String translatorClass;
- private ItemDescription parent;
- private List<ItemDescription> items = new ArrayList<ItemDescription>();
- }
-
private void addItem( Node node, ItemDescription parent )
{
ItemDescription item = new ItemDescription();
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/selectionModel/StartPageSelectionModel.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/selectionModel/StartPageSelectionModel.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/selectionModel/StartPageSelectionModel.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -26,6 +26,7 @@
package be.unid.tapestry.selectionModel;
import be.unid.tapestry.parser.border.Parser;
+import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.tapestry.util.Visit;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.form.IPropertySelectionModel;
@@ -49,14 +50,14 @@
{
this.resolver = resolver;
pages = new ArrayList<String>();
- List<Parser.ItemDescription> items = ( (Visit) resolver.getPage().getVisit() ).getBorderItems();
- for ( Parser.ItemDescription item : items )
+ List<ItemDescription> items = ( (Visit) resolver.getPage().getVisit() ).getBorderItems();
+ for ( ItemDescription item : items )
{
if ( item.getPage() != null && item.getPage().length() > 0 )
{
pages.add( item.getKey() );
}
- for (Parser.ItemDescription subItem: item.getItems())
+ for (ItemDescription subItem: item.getItems())
{
if ( subItem.getPage() != null && subItem.getPage().length() > 0 )
{
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/Visit.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/Visit.java 2009-05-21 13:37:10 UTC (rev 3840)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/util/Visit.java 2009-05-22 09:40:10 UTC (rev 3841)
@@ -29,6 +29,7 @@
import be.unid.reporting.parser.ReportParser;
import be.unid.tapestry.pages.UnidBasePage;
import be.unid.tapestry.parser.border.Parser;
+import be.unid.tapestry.parser.border.ItemDescription;
import be.unid.login.LoginInfo;
import java.util.List;
@@ -111,7 +112,7 @@
return borderParser;
}
- public List<Parser.ItemDescription> getBorderItems()
+ public List<ItemDescription> getBorderItems()
{
return getBorderParser().getItems();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-21 14:01:52
|
Revision: 3840
http://uni-d.svn.sourceforge.net/uni-d/?rev=3840&view=rev
Author: max_brod
Date: 2009-05-21 13:37:10 +0000 (Thu, 21 May 2009)
Log Message:
-----------
[UNI-467]
Added "hide-add-button" for tables.
Modified Paths:
--------------
trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm
trunk/Uni-d/docs/src/wiki/object-model.mm
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMRootTable.java
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java
trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Table.xml.vm
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMTable.java
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tableManager/TableManagerPage.java
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/tableManager/TableManagerPage.html
Modified: trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm
===================================================================
--- trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm 2009-05-21 11:30:19 UTC (rev 3839)
+++ trunk/Uni-d/docs/src/wiki/GUI-Descriptors-model.mm 2009-05-21 13:37:10 UTC (rev 3840)
@@ -1,9 +1,9 @@
-<map version="0.8.1">
+<map version="0.8.0">
<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
<node CREATED="1146160158228" ID="Freemind_Link_1338830509" MODIFIED="1146209410674" TEXT="GUI Descriptors model">
<cloud/>
<hook NAME="accessories/plugins/NodeNote.properties">
-<text>This is a simplified version of the Object model - only contains the info needed for the GUI.

In this map, only the new nodes (not present in the Object model) are documented.</text>
+<text>This is a simplified version of the Object model - only contains the info needed for the GUI.



In this map, only the new nodes (not present in the Object model) are documented.</text>
</hook>
<node COLOR="#006699" CREATED="1146160210192" ID="_" MODIFIED="1146160479210" POSITION="right" TEXT="table">
<edge WIDTH="thin"/>
@@ -19,6 +19,9 @@
<node COLOR="#338800" CREATED="1146162493146" ID="Freemind_Link_1231550989" MODIFIED="1146162510548" TEXT="name"/>
</node>
<node COLOR="#006699" CREATED="1146160641913" ID="Freemind_Link_1996565913" MODIFIED="1146160933947" TEXT="security-role-remove?"/>
+<node COLOR="#006699" CREATED="1242911610390" ID="Freemind_Link_1337372868" MODIFIED="1242911617015" TEXT="hide-add-button">
+<node CREATED="1242911624750" ID="Freemind_Link_177687712" MODIFIED="1242911633375" TEXT="Hide the [Add] button in GUI?"/>
+</node>
<node COLOR="#006699" CREATED="1146160650662" ID="Freemind_Link_1181541681" MODIFIED="1146160727079" TEXT="default?">
<node CREATED="1146162577406" ID="Freemind_Link_1866575291" MODIFIED="1146162655736" TEXT="the default type of table for GUI "/>
<node COLOR="#338800" CREATED="1146162581948" ID="Freemind_Link_280155491" MODIFIED="1146162602357" TEXT="type"/>
Modified: trunk/Uni-d/docs/src/wiki/object-model.mm
===================================================================
(Binary files differ)
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMRootTable.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMRootTable.java 2009-05-21 11:30:19 UTC (rev 3839)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMRootTable.java 2009-05-21 13:37:10 UTC (rev 3840)
@@ -897,4 +897,9 @@
{
return getTable().isNoTranslation();
}
+
+ public boolean isHideAddButton()
+ {
+ return getTable().isHideAddButton();
+ }
}
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java 2009-05-21 11:30:19 UTC (rev 3839)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java 2009-05-21 13:37:10 UTC (rev 3840)
@@ -88,6 +88,7 @@
private String expectedAmount;
private boolean hide; // should this be listed in Gui, in tables index?
private boolean noTranslation; // no translation is needed for this element?
+ private boolean hideAddButton; // hide add button in GUI
private boolean hideIf; // hide table in GUI depending on a class?
private String hideIfClass;
// Class implementing the HideIf interface, to be used in GUI at runtime, determining the visibility of the table
@@ -109,7 +110,8 @@
private static String[] childrenList = {
"description", "mapping", "if", "template", "security-role", "default-instance",
"security-role-remove", "page", "cloneable", "not-cloneable", "cascade-keep",
- "constraints", "hide", "no-hide", "select", "build", "action", "include", "data-filter", "no-translation" };
+ "constraints", "hide", "no-hide", "select", "build", "action", "include", "data-filter", "no-translation",
+ "hide-add-button" };
private static String[] constraintsChildrenList = { "unique", "required", "immutable", "immutable-if",
"mutable-even-if", "compare", "value-when-null",
"value-when-zero", "if" };
@@ -164,7 +166,7 @@
dbName +
')' );
}
- for ( int i = 1 ; i < charsName.length ; i++ )
+ for ( int i = 1; i < charsName.length ; i++ )
{
if ( ( !Character.isLetter( charsName[ i ] ) ) && ( !Character.isDigit( charsName[ i ] ) ) &&
( charsName[ i ]
@@ -415,6 +417,11 @@
noTranslation = true;
return false;
}
+ else if ( tag.equals( "hide-add-button" ) )
+ {
+ hideAddButton = true;
+ return false;
+ }
else if ( tag.equals( "hide" ) )
{
if ( attr.getValue( "if-class" ) == null )
@@ -509,7 +516,7 @@
{
NodeList nl = getNodesByTagName( "field" );
ArrayList<OMField> list = new ArrayList<OMField>( nl.getLength() );
- for ( int i = 0 ; i < nl.getLength() ; i++ ) list.add( (OMField) nl.item( i ) );
+ for ( int i = 0; i < nl.getLength() ; i++ ) list.add( (OMField) nl.item( i ) );
return list;
}
@@ -519,7 +526,7 @@
{
NodeList nl = getNodesByTagName( "select" );
ArrayList<OMSelect> list = new ArrayList<OMSelect>();
- for ( int i = 0 ; i < nl.getLength() ; i++ ) list.add( (OMSelect) nl.item( i ) );
+ for ( int i = 0; i < nl.getLength() ; i++ ) list.add( (OMSelect) nl.item( i ) );
selects = list;
}
return selects;
@@ -587,12 +594,12 @@
// copy the fields which are part of the table
NodeList ch = template.getNodesByTagName( "page" );
- for ( int i = 0 ; i < ch.getLength() ; i++ )
+ for ( int i = 0; i < ch.getLength() ; i++ )
{
OMPage page = (OMPage) ch.item( i );
page = (OMPage) page.clone();
NodeList nl = page.getNodesByTagName( "field" );
- for ( int j = 0 ; j < nl.getLength() ; j++ )
+ for ( int j = 0; j < nl.getLength() ; j++ )
{
OMField field = (OMField) nl.item( j );
if ( inherited ) field.setInherited( true );
@@ -611,7 +618,7 @@
// copy the selections which are part of the table
ch = template.getNodesByTagName( "select" );
- for ( int i = 0 ; i < ch.getLength() ; i++ )
+ for ( int i = 0; i < ch.getLength() ; i++ )
{
OMSelect sel = (OMSelect) ch.item( i );
if ( !hasSelect( sel.getName() ) )
@@ -623,7 +630,7 @@
// now I should overwrite the changed settings for the fields
NodeList dv = node.getNodesByTagName( "overwrite-default" );
- for ( int i = 0 ; i < dv.getLength() ; i++ )
+ for ( int i = 0; i < dv.getLength() ; i++ )
{
OMDefault val = (OMDefault) dv.item( i );
OMField org = getField( val.getAttribute( "field" ) );
@@ -715,8 +722,8 @@
getRoot().getName() +
"Bean o ORDER BY o." +
tmpRef.getVarName(), true,
- true,
- true );
+ true,
+ true );
addOMSelect( selFirst );
selFirst.setNoTranslation( true );
root.addOMSelect( selFirst );
@@ -734,7 +741,7 @@
"Bean o ORDER BY o." +
tmpRef.getVarName() +
" DESCENDING", true, true,
- true );
+ true );
addOMSelect( selLast );
selLast.setNoTranslation( true );
root.addOMSelect( selLast );
@@ -855,7 +862,7 @@
Node n = this;
while ( !( n instanceof OMDatabase ) ) n = n.getParentNode();
NodeList nl = n.getNodesByTagName( "root-table" );
- for ( int i = 0 ; i < nl.getLength() ; i++ )
+ for ( int i = 0; i < nl.getLength() ; i++ )
{
OMRootTable root = (OMRootTable) nl.item( i );
if ( root.getName().equals( field.linkTableName ) )
@@ -949,7 +956,7 @@
while ( node.getParentNode() != null ) node = node.getParentNode();
// search for table with given name
NodeList nl = node.getNodesByTagName( "table" );
- for ( int i = 0 ; i < nl.getLength() ; i++ )
+ for ( int i = 0; i < nl.getLength() ; i++ )
{
OMTable table = (OMTable) nl.item( i );
if ( table.getName().equals( name ) )
@@ -971,7 +978,7 @@
OMField getField( String name )
{
NodeList nl = getNodesByTagName( "field" );
- for ( int i = 0 ; i < nl.getLength() ; i++ )
+ for ( int i = 0; i < nl.getLength() ; i++ )
{
OMField field = (OMField) nl.item( i );
if ( field.getName().equals( name ) ) return field;
@@ -983,7 +990,7 @@
OMPage getPage( String name )
{
NodeList nl = getNodesByTagName( "page" );
- for ( int i = 0 ; i < nl.getLength() ; i++ )
+ for ( int i = 0; i < nl.getLength() ; i++ )
{
OMPage page = (OMPage) nl.item( i );
if ( page.getName().equals( name ) ) return page;
@@ -995,7 +1002,7 @@
private boolean hasSelect( String name )
{
NodeList nl = getNodesByTagName( "select" );
- for ( int i = 0 ; i < nl.getLength() ; i++ )
+ for ( int i = 0; i < nl.getLength() ; i++ )
{
OMSelect sel = (OMSelect) nl.item( i );
if ( sel.getName().equals( name ) ) return true;
@@ -1009,7 +1016,7 @@
NodeList nodes = this.getChildNodes();
if ( nodes != null )
{
- for ( int i = 0 ; i < nodes.getLength() ; i++ )
+ for ( int i = 0; i < nodes.getLength() ; i++ )
{
Object o = nodes.item( i );
if ( o != null )
@@ -1061,7 +1068,7 @@
while ( node.getParentNode() != null ) node = node.getParentNode();
// search for table with given name
NodeList nl = node.getNodesByTagName( "table" );
- for ( int i = 0 ; i < nl.getLength() && root == null ; i++ )
+ for ( int i = 0; i < nl.getLength() && root == null ; i++ )
{
OMTable table = (OMTable) nl.item( i );
if ( table.getName().equals( parentTable ) )
@@ -1139,7 +1146,7 @@
{
NodeList nl = getNodesByTagName( name );
ArrayList list = new ArrayList( nl.getLength() );
- for ( int i = 0 ; i < nl.getLength() ; i++ ) list.add( nl.item( i ) );
+ for ( int i = 0; i < nl.getLength() ; i++ ) list.add( nl.item( i ) );
return list;
}
@@ -1246,6 +1253,11 @@
return noTranslation;
}
+ public boolean isHideAddButton()
+ {
+ return hideAddButton;
+ }
+
public String getCategory()
{
return category;
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java 2009-05-21 11:30:19 UTC (rev 3839)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/UnidNodesMap.java 2009-05-21 13:37:10 UTC (rev 3840)
@@ -53,6 +53,7 @@
put( "overwrite-default", null );
put( "security-role", new ElementInfo( "security-role", "security-role" ) );
put( "security-role-remove", new ElementInfo( "security-role-remove", "security-role-remove" ) );
+ put( "hide-add-button", new ElementInfo( "hide-add-button", "hide-add-button" ) );
put( "page", null );
put( "group", null );
put( "field", null );
Modified: trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Table.xml.vm
===================================================================
--- trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Table.xml.vm 2009-05-21 11:30:19 UTC (rev 3839)
+++ trunk/Uni-d/generate/src/main/velocity/gui-descriptors/Table.xml.vm 2009-05-21 13:37:10 UTC (rev 3840)
@@ -39,6 +39,10 @@
<hide if-class="$table.HideIfClass" #if( $table.hasHideIfParameters() ) parameters="$table.HideIfParameters" #end/>
#end
+#if( $table.isHideAddButton() )
+ <hide-add-button/>
+#end
+
#foreach( $type in $table.Types )
#if( !$table.Name.equals( $type.Name ) )
<ttype name="$type.Name" type="$type.Type"/>
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMTable.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMTable.java 2009-05-21 11:30:19 UTC (rev 3839)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/model/GMTable.java 2009-05-21 13:37:10 UTC (rev 3840)
@@ -75,9 +75,11 @@
private boolean hideIf; // hide table in GUI depending on a class?
private String hideIfClass;
- // Class implementing the HideIf interface, to be used in GUI at runtime, determining the visibility of the table
+ // Class implementing the HideIf interface, to be used in GUI at runtime, determining the visibility of the table
private String hideIfParameters; // parameters to be passed to the hide-if table
+ private boolean hideAddButton; // hide the Add button in gui?
+
private ArrayList<LinkedSelect> linkedSelects =
new ArrayList<LinkedSelect>(); // list with selects that have a single parameter of this table type
private ArrayList<LinkedSelect> moreLinkedSelects =
@@ -190,6 +192,10 @@
}
}
}
+ else if ( tag.equals( "hide-add-button" ) )
+ {
+ hideAddButton = true;
+ }
else
{
return super.canAppendChild( tag, attr );
@@ -526,4 +532,14 @@
{
return fullTextSearchable;
}
+
+ public boolean isHideAddButton()
+ {
+ return hideAddButton;
+ }
+
+ public void setHideAddButton( boolean hideAddButton )
+ {
+ this.hideAddButton = hideAddButton;
+ }
}
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tableManager/TableManagerPage.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tableManager/TableManagerPage.java 2009-05-21 11:30:19 UTC (rev 3839)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/pages/tableManager/TableManagerPage.java 2009-05-21 13:37:10 UTC (rev 3840)
@@ -196,4 +196,10 @@
{
return "LINK_SELECT_" + getSelect();
}
+
+ public boolean isAddButtonVisible()
+ {
+ GMTable table = DescriptionFactory.getTableDescription( getTableName() );
+ return !table.isHideAddButton();
+ }
}
\ No newline at end of file
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/tableManager/TableManagerPage.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/tableManager/TableManagerPage.html 2009-05-21 11:30:19 UTC (rev 3839)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/pages/tableManager/TableManagerPage.html 2009-05-21 13:37:10 UTC (rev 3840)
@@ -54,11 +54,13 @@
</span>
</div>
</span>
- <div class="tableManagerAdd">
- <span jwcid="@NavigationLink" listener="listener:actionListenerAdd" parameters="prop:tableName" id="prop:addId">
- <span jwcid="@Insert" value="prop:addLabel"/>
- </span>
+ <span jwcid="@If" condition="prop:addButtonVisible">
+ <div class="tableManagerAdd">
+ <span jwcid="@NavigationLink" listener="listener:actionListenerAdd" parameters="prop:tableName" id="prop:addId">
+ <span jwcid="@Insert" value="prop:addLabel"/>
+ </span>
+ </div>
+ </span>
</div>
- </div>
</border>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-21 11:30:29
|
Revision: 3839
http://uni-d.svn.sourceforge.net/uni-d/?rev=3839&view=rev
Author: max_brod
Date: 2009-05-21 11:30:19 +0000 (Thu, 21 May 2009)
Log Message:
-----------
[ICT-1143]
For inactive records, don't allow direct entering of reference either.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/actionHandler/LinkInputActionHandlerImpl.java
trunk/Uni-d/template/src/main/webapp/translations-common.txt
Modified: trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/actionHandler/LinkInputActionHandlerImpl.java
===================================================================
--- trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/actionHandler/LinkInputActionHandlerImpl.java 2009-05-19 10:13:33 UTC (rev 3838)
+++ trunk/Uni-d/tapestry/src/main/java/be/unid/tapestry/components/input/unidLinkInput/actionHandler/LinkInputActionHandlerImpl.java 2009-05-21 11:30:19 UTC (rev 3839)
@@ -168,6 +168,7 @@
if ( parameters.error == null && results != null && results.size() > 0 )
{
UnidProxy result = results.get( 0 );
+
id = result.getUOID().getId();
display =
calculateDisplayForProxy( result, parameters.isFake, parameters.updateField, parameters.refFieldName,
@@ -184,6 +185,19 @@
val = UnidProxyAccessor.getField( result, parameters.getRefFieldName() );
}
if ( val != null ) input = val.toString();
+ Global global = (Global) component.getPage().getGlobal();
+ if ( global.isInactiveRecordsHidden() )
+ {
+ GMTable table=DescriptionFactory.getTableDescription( parameters.getTableName());
+ if (table.getField( "Inactive")!=null )
+ {
+ Boolean inactive = (Boolean) UnidProxyAccessor.getField( result, "Inactive" );
+ if (inactive)
+ {
+ parameters.setError( component.getMessages().getMessage("error.inactive.record"));
+ }
+ }
+ }
}
catch ( Exception e )
{
@@ -376,7 +390,7 @@
int i = 1;
for ( String filter : preparedStatement.filters )
{
- filtersTable.put( "auto-filter-" +preparedStatement.linkTableName+ i, filter );
+ filtersTable.put( "auto-filter-" + preparedStatement.linkTableName + i, filter );
}
Global global = (Global) component.getPage().getGlobal();
if ( global.getSelectorsState() != null &&
Modified: trunk/Uni-d/template/src/main/webapp/translations-common.txt
===================================================================
--- trunk/Uni-d/template/src/main/webapp/translations-common.txt 2009-05-19 10:13:33 UTC (rev 3838)
+++ trunk/Uni-d/template/src/main/webapp/translations-common.txt 2009-05-21 11:30:19 UTC (rev 3839)
@@ -1074,6 +1074,10 @@
.label.nl D
.label.ro D
.label.fr D
+.key error.inactive.record/Uni-d-fixed
+.label.en Record is inactive
+.label.nl Record is niet actief
+.label.ro Inregistrarea e inactiva
+.label.fr Cet record n'est pas actif
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pus...@us...> - 2009-05-19 10:13:52
|
Revision: 3838
http://uni-d.svn.sourceforge.net/uni-d/?rev=3838&view=rev
Author: pushkutza
Date: 2009-05-19 10:13:33 +0000 (Tue, 19 May 2009)
Log Message:
-----------
uni-465
Modified Paths:
--------------
trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java
trunk/Uni-d/generate/src/main/resources/uni-d.dtd
Modified: trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java
===================================================================
--- trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java 2009-05-18 14:56:02 UTC (rev 3837)
+++ trunk/Uni-d/generate/src/main/java/be/unid/persistence/xml/OMTable.java 2009-05-19 10:13:33 UTC (rev 3838)
@@ -35,9 +35,10 @@
import java.io.File;
import java.io.FilenameFilter;
+import java.io.FileFilter;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Map;
+import java.util.Collections;
/**
* a node for processing the XML tree
@@ -65,6 +66,7 @@
private String name; // table name
private String dbName; // table name at database level
private String replace; // replace this table by given file or directory (dir starts with "$")
+ private boolean deepsearch; // when true it will search in the child dirs also for definition files
private String database; // database name for this table
private String baseClass; // parent class for the objects,
private ArrayList tableChild = new ArrayList(); // list if tables which inherit from this table
@@ -162,7 +164,7 @@
dbName +
')' );
}
- for ( int i = 1; i < charsName.length ; i++ )
+ for ( int i = 1 ; i < charsName.length ; i++ )
{
if ( ( !Character.isLetter( charsName[ i ] ) ) && ( !Character.isDigit( charsName[ i ] ) ) &&
( charsName[ i ]
@@ -197,6 +199,16 @@
}
replace = '$' + gen.getCurrentTablesDir() + value;
}
+ else if ( name.equals( "deepsearch" ) )
+ {
+ if ( replace != null && !replace.startsWith( "$" ) )
+ {
+ throw new XMLTreeException( XMLTreeException.NOT_SUPPORTED_ERR,
+ "Table " + this.name +
+ " - <table> allows deepsearch only when dir is set" );
+ }
+ deepsearch = Boolean.parseBoolean( value.toString() );
+ }
else if ( name.equals( "extends" ) )
{
this.baseClass = value.toString();
@@ -237,15 +249,14 @@
if ( replace.charAt( 0 ) == '$' )
{
File dir = new File( replace.substring( 1 ) );
- String[] list = dir.list( new FilenameFilter()
+ ArrayList<String> filesToAppend = new ArrayList<String>();
+ initDirs( dir, filesToAppend, null );
+ Collections.sort( filesToAppend );
+ for ( String aList : filesToAppend )
{
- public boolean accept( File dir, String name )
- {
- return name.toLowerCase().endsWith( ".table" );
- }
- } );
- Arrays.sort( list );
- for ( String aList : list ) include( aList );
+ System.out.println( "Table definition found : " + aList );
+ include( aList );
+ }
}
else
{
@@ -254,6 +265,34 @@
}
}
+ private void initDirs( File dir, ArrayList<String> filesToAppendTo, String relativePath )
+ {
+ relativePath = relativePath != null ? relativePath + dir.getName() + "/" : "";
+ // add the files in the current dir
+ String[] list = dir.list( new FilenameFilter()
+ {
+ public boolean accept( File dir, String name )
+ {
+ return name.toLowerCase().endsWith( ".table" );
+ }
+ } );
+ for ( String aList : list )
+ {
+ filesToAppendTo.add( relativePath + aList );
+ }
+ if ( deepsearch )
+ {
+ File[] dirlist = dir.listFiles( new FileFilter()
+ {
+ public boolean accept( File pathname )
+ {
+ return pathname.isDirectory();
+ }
+ } );
+ for ( File singleDir : dirlist ) initDirs( singleDir, filesToAppendTo, relativePath );
+ }
+ }
+
public boolean canAppendChild( CharSequence tag, Attributes attr )
{
if ( tag.equals( "mapping" ) )
@@ -470,7 +509,7 @@
{
NodeList nl = getNodesByTagName( "field" );
ArrayList<OMField> list = new ArrayList<OMField>( nl.getLength() );
- for ( int i = 0; i < nl.getLength() ; i++ ) list.add( (OMField) nl.item( i ) );
+ for ( int i = 0 ; i < nl.getLength() ; i++ ) list.add( (OMField) nl.item( i ) );
return list;
}
@@ -480,7 +519,7 @@
{
NodeList nl = getNodesByTagName( "select" );
ArrayList<OMSelect> list = new ArrayList<OMSelect>();
- for ( int i = 0; i < nl.getLength() ; i++ ) list.add( (OMSelect) nl.item( i ) );
+ for ( int i = 0 ; i < nl.getLength() ; i++ ) list.add( (OMSelect) nl.item( i ) );
selects = list;
}
return selects;
@@ -548,12 +587,12 @@
// copy the fields which are part of the table
NodeList ch = template.getNodesByTagName( "page" );
- for ( int i = 0; i < ch.getLength() ; i++ )
+ for ( int i = 0 ; i < ch.getLength() ; i++ )
{
OMPage page = (OMPage) ch.item( i );
page = (OMPage) page.clone();
NodeList nl = page.getNodesByTagName( "field" );
- for ( int j = 0; j < nl.getLength() ; j++ )
+ for ( int j = 0 ; j < nl.getLength() ; j++ )
{
OMField field = (OMField) nl.item( j );
if ( inherited ) field.setInherited( true );
@@ -572,7 +611,7 @@
// copy the selections which are part of the table
ch = template.getNodesByTagName( "select" );
- for ( int i = 0; i < ch.getLength() ; i++ )
+ for ( int i = 0 ; i < ch.getLength() ; i++ )
{
OMSelect sel = (OMSelect) ch.item( i );
if ( !hasSelect( sel.getName() ) )
@@ -584,7 +623,7 @@
// now I should overwrite the changed settings for the fields
NodeList dv = node.getNodesByTagName( "overwrite-default" );
- for ( int i = 0; i < dv.getLength() ; i++ )
+ for ( int i = 0 ; i < dv.getLength() ; i++ )
{
OMDefault val = (OMDefault) dv.item( i );
OMField org = getField( val.getAttribute( "field" ) );
@@ -816,7 +855,7 @@
Node n = this;
while ( !( n instanceof OMDatabase ) ) n = n.getParentNode();
NodeList nl = n.getNodesByTagName( "root-table" );
- for ( int i = 0; i < nl.getLength() ; i++ )
+ for ( int i = 0 ; i < nl.getLength() ; i++ )
{
OMRootTable root = (OMRootTable) nl.item( i );
if ( root.getName().equals( field.linkTableName ) )
@@ -910,7 +949,7 @@
while ( node.getParentNode() != null ) node = node.getParentNode();
// search for table with given name
NodeList nl = node.getNodesByTagName( "table" );
- for ( int i = 0; i < nl.getLength() ; i++ )
+ for ( int i = 0 ; i < nl.getLength() ; i++ )
{
OMTable table = (OMTable) nl.item( i );
if ( table.getName().equals( name ) )
@@ -932,7 +971,7 @@
OMField getField( String name )
{
NodeList nl = getNodesByTagName( "field" );
- for ( int i = 0; i < nl.getLength() ; i++ )
+ for ( int i = 0 ; i < nl.getLength() ; i++ )
{
OMField field = (OMField) nl.item( i );
if ( field.getName().equals( name ) ) return field;
@@ -944,7 +983,7 @@
OMPage getPage( String name )
{
NodeList nl = getNodesByTagName( "page" );
- for ( int i = 0; i < nl.getLength() ; i++ )
+ for ( int i = 0 ; i < nl.getLength() ; i++ )
{
OMPage page = (OMPage) nl.item( i );
if ( page.getName().equals( name ) ) return page;
@@ -956,7 +995,7 @@
private boolean hasSelect( String name )
{
NodeList nl = getNodesByTagName( "select" );
- for ( int i = 0; i < nl.getLength() ; i++ )
+ for ( int i = 0 ; i < nl.getLength() ; i++ )
{
OMSelect sel = (OMSelect) nl.item( i );
if ( sel.getName().equals( name ) ) return true;
@@ -970,7 +1009,7 @@
NodeList nodes = this.getChildNodes();
if ( nodes != null )
{
- for ( int i = 0; i < nodes.getLength() ; i++ )
+ for ( int i = 0 ; i < nodes.getLength() ; i++ )
{
Object o = nodes.item( i );
if ( o != null )
@@ -1022,7 +1061,7 @@
while ( node.getParentNode() != null ) node = node.getParentNode();
// search for table with given name
NodeList nl = node.getNodesByTagName( "table" );
- for ( int i = 0; i < nl.getLength() && root == null ; i++ )
+ for ( int i = 0 ; i < nl.getLength() && root == null ; i++ )
{
OMTable table = (OMTable) nl.item( i );
if ( table.getName().equals( parentTable ) )
@@ -1100,7 +1139,7 @@
{
NodeList nl = getNodesByTagName( name );
ArrayList list = new ArrayList( nl.getLength() );
- for ( int i = 0; i < nl.getLength() ; i++ ) list.add( nl.item( i ) );
+ for ( int i = 0 ; i < nl.getLength() ; i++ ) list.add( nl.item( i ) );
return list;
}
Modified: trunk/Uni-d/generate/src/main/resources/uni-d.dtd
===================================================================
--- trunk/Uni-d/generate/src/main/resources/uni-d.dtd 2009-05-18 14:56:02 UTC (rev 3837)
+++ trunk/Uni-d/generate/src/main/resources/uni-d.dtd 2009-05-19 10:13:33 UTC (rev 3838)
@@ -85,6 +85,7 @@
name CDATA #IMPLIED
file CDATA #IMPLIED
dir CDATA #IMPLIED
+deepsearch CDATA #IMPLIED
extends CDATA #IMPLIED
type CDATA #IMPLIED
expected-amount (small|medium|large) "large"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <max...@us...> - 2009-05-18 14:56:06
|
Revision: 3837
http://uni-d.svn.sourceforge.net/uni-d/?rev=3837&view=rev
Author: max_brod
Date: 2009-05-18 14:56:02 +0000 (Mon, 18 May 2009)
Log Message:
-----------
[UNI-464]
Improve the look of select pages in uni-d.
Modified Paths:
--------------
trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.html
Modified: trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.html
===================================================================
--- trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.html 2009-05-15 12:55:37 UTC (rev 3836)
+++ trunk/Uni-d/tapestry/src/main/resources/be/unid/tapestry/components/select/unidSelectResults/UnidSelectResults.html 2009-05-18 14:56:02 UTC (rev 3837)
@@ -69,7 +69,7 @@
parameters="prop:pageCount">>></a>
</span>
- <table align="center" border="1" width="90%">
+ <table align="center" border="1" width="90%" style="border-collapse: collapse;">
<tbody>
<tr>
<span jwcid="foreachHeaderColumn">
@@ -117,10 +117,10 @@
<a jwcid="@NavigationLink" listener="listener:select"
parameters="ognl:{RowProxy.getUOID().getId()}">
<img jwcid="@Any" src="asset:imageSelect" border="0"/>
- </a>
+ </a>
</span>
<span jwcid="@If" condition="prop:uoidColumn">
- <span jwcid="@Insert" value="ognl:getRowProxy().getUOID().getId()"/>
+ <span jwcid="@Insert" value="ognl:getRowProxy().getUOID().getId()"/>
</span>
</span>
<span jwcid="@Else">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
