Menu
▾
▴
equanda-svn-commit — svn commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(6) |
Aug
(41) |
Sep
(44) |
Oct
(31) |
Nov
(54) |
Dec
(53) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(71) |
Feb
(66) |
Mar
(65) |
Apr
(73) |
May
(68) |
Jun
(69) |
Jul
(28) |
Aug
(49) |
Sep
(44) |
Oct
(77) |
Nov
(64) |
Dec
(78) |
| 2009 |
Jan
(50) |
Feb
(28) |
Mar
(41) |
Apr
(30) |
May
(5) |
Jun
(30) |
Jul
(6) |
Aug
(2) |
Sep
(18) |
Oct
(11) |
Nov
(6) |
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(8) |
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <tri...@us...> - 2007-10-12 13:11:44
|
Revision: 118
http://equanda.svn.sourceforge.net/equanda/?rev=118&view=rev
Author: triathlon98
Date: 2007-10-12 06:11:40 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
fix ontology, assure triples are not merged
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm
Modified: trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm 2007-10-11 07:48:17 UTC (rev 117)
+++ trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm 2007-10-12 13:11:40 UTC (rev 118)
@@ -46,18 +46,20 @@
#end
#end
#end
+#set( $count = 0 )
#foreach( $table in $tables )
#if( !${table.Name.startsWith("Equanda")} )
<owl:Class rdf:ID="${table.Name}"/>
#foreach( $field in $table.Fields )
+#set( $count = $count + 1 )
#if( !${field.Name.startsWith("equanda")} )
#if( $field.isLink() )
-<owl:ObjectProperty rdf:ID="has${field.Name}">
+<owl:ObjectProperty rdf:ID="has${field.Name}$count">
<rdfs:domain rdf:resource="#${table.Name}"/>
<rdfs:range rdf:resource="#${field.FieldTypeName}"/>
</owl:ObjectProperty>
#else
-<owl:DatatypeProperty rdf:ID="has${field.Name}">
+<owl:DatatypeProperty rdf:ID="has${field.Name}$count">
<rdfs:domain rdf:resource="#${table.Name}"/>
#if( $field.isString() )
<rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-11 07:48:24
|
Revision: 117
http://equanda.svn.sourceforge.net/equanda/?rev=117&view=rev
Author: triathlon98
Date: 2007-10-11 00:48:17 -0700 (Thu, 11 Oct 2007)
Log Message:
-----------
small fix, it is a dummy url anyway
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm
Modified: trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm 2007-10-10 13:07:56 UTC (rev 116)
+++ trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm 2007-10-11 07:48:17 UTC (rev 117)
@@ -30,7 +30,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:owl="http://www.w3.org/2002/07/owl#"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
- xmlns="http://synergetics.be/cempetencies.owl#"
+ xmlns="http://equanda.org/ontology.owl#"
xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
xml:base="http://equanda.org/ontology.owl">
<owl:Ontology rdf:about=""/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-10 13:07:57
|
Revision: 116
http://equanda.svn.sourceforge.net/equanda/?rev=116&view=rev
Author: triathlon98
Date: 2007-10-10 06:07:56 -0700 (Wed, 10 Oct 2007)
Log Message:
-----------
add ontology link
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/docs/index.html.vm
Modified: trunk/equanda-generate/src/main/velocity/docs/index.html.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs/index.html.vm 2007-10-09 20:12:02 UTC (rev 115)
+++ trunk/equanda-generate/src/main/velocity/docs/index.html.vm 2007-10-10 13:07:56 UTC (rev 116)
@@ -35,6 +35,7 @@
<center><H2>Tables</H2></center>
<p><a href="om.mm"/>Object model as freemind mindmap</a></p>
+<p><a href="ontology.owl"/>Object model as ontology</a></p>
<UL>
#foreach( $table in $tables )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-09 20:12:10
|
Revision: 115
http://equanda.svn.sourceforge.net/equanda/?rev=115&view=rev
Author: triathlon98
Date: 2007-10-09 13:12:02 -0700 (Tue, 09 Oct 2007)
Log Message:
-----------
EQ-68 replace all findXxx to selectXxx for consistency
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/export/Export.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaSelector.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/ExceptionCodes.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyEJBListBase.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyList.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyProxyListBase.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/AbstractSelect.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
trunk/equanda-generate/src/main/resources/equanda.dtd
trunk/equanda-generate/src/main/velocity/ejb3/MediatorBase-set.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm
trunk/equanda-generate/src/main/velocity/ejb3.ini
trunk/equanda-generate/src/main/velocity/import/DatabaseMap.java.vm
trunk/equanda-generate/src/main/velocity/import/TableHandler.java.vm
trunk/equanda-generate/src/main/velocity/login/LoginModule.java.vm
trunk/equanda-generate/src/main/velocity/login/bean/LoginBean.java.vm
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/TemplatePlugin.java
trunk/equanda-server/src/main/java/org/equanda/attachment/AttachmentServlet.java
trunk/equanda-server/src/main/java/org/equanda/reporting/servlet/CustomExporter.java
trunk/equanda-server/src/main/java/org/equanda/ymport/DatabaseMap.java
trunk/equanda-server/src/main/java/org/equanda/ymport/DatabaseMapAdapter.java
trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java
trunk/equanda-server/src/main/java/org/equanda/ymport/ImportParser.java
trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java
trunk/equanda-server/src/test/java/org/equanda/ymport/ImportParserTest.java
trunk/equanda-t4-template/src/main/webapp/FixNumberTranslators.js
trunk/equanda-t4-template/src/main/webapp/dojo/dojo.js
trunk/equanda-t4-template/src/main/webapp/dojo/dojo.js.uncompressed.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/AdapterRegistry.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/bootstrap1.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/doc.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/dom.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/flash.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/hostenv_adobesvg.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/hostenv_rhino.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/hostenv_spidermonkey.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/html.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/iCalendar.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/io/RepubsubIO.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/io/ScriptSrcIO.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/style.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/validate.js
trunk/equanda-t4-template/src/main/webapp/dojo/src/xml/svgUtil.js
trunk/equanda-t4-template/src/main/webapp/tabtastic/tabtastic.js
trunk/equanda-t4-template/src/main/webapp/translations-common.txt
trunk/equanda-tapestry4/src/main/java/org/equanda/reporting/parser/ReportParser.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/binder/BasicFieldBinder.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/LinkInputBinderWrapper.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/actionHandler/LinkInputActionHandlerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/SelectObject.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/shared/ConfigurationKeys.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/NavigationEntryContainer.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/NavigationablePageImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/TapestryHome.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/alerts/Alerts.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/alerts/dataModel/AlertsAdministrationQuery.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/select/SelectPage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/shared/AddViewEditManipulation.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/tableManager/TableManagerPage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/login/changePassword/ChangePassword.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/startPageConfig/StartPageConfig.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/wiki/ViewPageRedirector.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/LinkFieldSelectionModel.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/RoleSelectionModel.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/squeezeAdaptor/EquandaProxySqueezeAdaptor.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/squeezeAdaptor/SelectObjectSqueezeAdaptor.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/translator/UoidTranslator.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/cache/CacheLoaderPersister.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/EquandaProxyAccessor.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/LoginResolver.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/SuggestValueList.java
trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.script
trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.script
trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.script
trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/components/masterDetail/main/MasterDetailComponent.script
trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/pages/alerts/Alerts.html
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/EquandaRoleMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/om/server/LinkableMediator.java
trunk/equanda-test/test-core/src/main/resources/translations.txt
trunk/equanda-test/test-gui-t4-test/src/test/selenium/gui/TestAddContinue.html
trunk/equanda-test/test-gui-t4-test/src/test/selenium/gui/TestSelect.html
trunk/equanda-test/test-t4-gui/src/main/webapp/WEB-INF/pages/testFilters/TestFilters.html
trunk/equanda-test/test-t4-gui/src/main/webapp/config.properties
trunk/equanda-test/test-test/src/test/java/org/equanda/test/applet/TestApplet.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ActionTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/DowngradeTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EmbeddedTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EntityTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EquandaQueryTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/LazyInstTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ModifiedProxyTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/MultipleFieldTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/ProxyTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RemoveLinksTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/RemoveTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SecurityTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectionTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorUpdateTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsFiltersTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsSortingTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SetEquandaRollbackTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/StringLengthTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SubselectTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/UniqueFieldsTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java
trunk/equanda-tool/export.ini
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportWorker.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionObject.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ObjectSelector.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/ImportWorker.java
trunk/equanda-tool/tool.ini
trunk/equanda-util/src/main/java/org/equanda/util/xml/tree/XMLDocumentBuilder.java
trunk/src/site/wiki/ExpectedAmount.wiki
trunk/src/site/wiki/Export.wiki
trunk/src/site/wiki/GuiPageFinder.wiki
trunk/src/site/wiki/GuiPageStructure.wiki
trunk/src/site/wiki/Import.wiki
trunk/src/site/wiki/ImportFileFormat.wiki
trunk/src/site/wiki/confluence.wiki
trunk/src/site/wiki/index.wiki
trunk/src/site/wiki/lazy.wiki
trunk/src/site/wiki/suggest.wiki
Added Paths:
-----------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectSelector.java
trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm
trunk/equanda-generate/src/main/velocity/import/build-default-selectors.vm
Removed Paths:
-------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java
trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm
trunk/equanda-generate/src/main/velocity/import/build-default-finders.vm
Modified: trunk/equanda-client/src/main/java/org/equanda/export/Export.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -384,11 +384,11 @@
Method method;
try
{
- method = objClass.getMethod( "findUOID", param );
+ method = objClass.getMethod( "selectUOID", param );
}
catch ( Exception e )
{
- throw new ExportException( "Cannot find method findUOID in " + objClass.getName(), e );
+ throw new ExportException( "Cannot find method selectUOID in " + objClass.getName(), e );
}
Object[] param_v = { objToExport };
@@ -399,7 +399,7 @@
catch ( Exception e )
{
throw new ExportException(
- "findUOID " + ( (UOID) objToExport ).getId() + " in " + objClass.getName() + " failed",
+ "selectUOID " + ( (UOID) objToExport ).getId() + " in " + objClass.getName() + " failed",
e );
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaSelector.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaSelector.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaSelector.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -41,23 +41,23 @@
PROXY equandaCreate( String type )
throws EquandaPersistenceException;
- PROXY findUOID( UOID uoid )
+ PROXY selectUOID( UOID uoid )
throws EquandaPersistenceException;
- EJB findUOIDEJB( UOID uoid )
+ EJB selectUOIDEJB( UOID uoid )
throws EquandaPersistenceException;
- PROXY[] findMultipleUOID( UOID[] arr )
+ PROXY[] selectMultipleUOID( UOID[] arr )
throws EquandaPersistenceException;
/*
* run query methods
*/
- List<PROXY> findEquanda( EquandaQuery query )
+ List<PROXY> selectEquanda( EquandaQuery query )
throws EquandaPersistenceException;
- List<EJB> findEquandaEJB( EquandaQuery query )
+ List<EJB> selectEquandaEJB( EquandaQuery query )
throws EquandaPersistenceException;
List<UOID> equandaRunQueryUOID( EquandaQuery query )
@@ -75,10 +75,10 @@
long equandaRunUpdateQuery( EquandaQuery query )
throws EquandaPersistenceException;
- PROXY findEquandaSingle( EquandaQuery query )
+ PROXY selectEquandaSingle( EquandaQuery query )
throws EquandaPersistenceException;
- EJB findEquandaSingleEJB( EquandaQuery query )
+ EJB selectEquandaSingleEJB( EquandaQuery query )
throws EquandaPersistenceException;
PROXY equandaRefresh( UOID uoid, long version )
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/ExceptionCodes.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/ExceptionCodes.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/ExceptionCodes.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -58,7 +58,7 @@
int ECV_CONSTRAINT_VIOLATION = 91011;
int ECV_FAILED_TO_UPDATE_VALUE = 91012;
int ECV_DOWNCAST_FAILED_CANNOT_DOWNCAST_ROOT = 91013;
- int ECV_DOWNCAST_FINDER_ERROR = 91014;
+ int ECV_DOWNCAST_SELECTOR_ERROR = 91014;
int ECV_DOWNCAST_CREATE_ERROR = 91015;
int ECV_INVALID_TABLE_TYPE = 91016;
int ECV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET = 91017;
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyEJBListBase.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyEJBListBase.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyEJBListBase.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -60,7 +60,7 @@
throws NamingException, EquandaPersistenceException
{
SEL sel = getSelector();
- EJB res = sel.findUOIDEJB( uoid );
+ EJB res = sel.selectUOIDEJB( uoid );
sel.remove();
return res;
}
@@ -92,7 +92,7 @@
{
SEL sel = getSelector();
EJB[] res = (EJB[]) new EquandaEJB[uoids.length];
- for ( int i = 0; i < uoids.length ; i++ ) res[ i ] = sel.findUOIDEJB( uoids[ i ] );
+ for ( int i = 0; i < uoids.length ; i++ ) res[ i ] = sel.selectUOIDEJB( uoids[ i ] );
sel.remove();
return res;
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyList.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyList.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyList.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -40,7 +40,7 @@
* These batches are cached and the expiration timeout for this cache is also configurable.
* <p/>
* When an element is obtained, an attempt is made to get the data from the cache.
- * If the cache is stale (timeout exceeded), then the instance is refreshed (to minimize the number of full finders).
+ * If the cache is stale (timeout exceeded), then the instance is refreshed (to minimize the number of full selectors).
* <p/>
* For resultsets which cannot be batched (ADD on subselects), the full list of UOIDs for the elements is maintained.
* <p/>
@@ -241,7 +241,7 @@
int size;
if ( hasSubselects || addOperator )
{
- // size() should still be done for finder with SubSelects and "add" operator
+ // size() should still be done for selector with SubSelects and "add" operator
long min = Math.min( getCacheCapacity(), fullSize() - index );
size = ( min > Integer.MAX_VALUE ) ? Integer.MAX_VALUE : (int) min;
UOID[] uoids = new UOID[ size ];
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyProxyListBase.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyProxyListBase.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/LazyProxyListBase.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -60,7 +60,7 @@
throws NamingException, EquandaPersistenceException
{
SEL sel = getSelector();
- PROXY res = sel.findUOID( uoid );
+ PROXY res = sel.selectUOID( uoid );
sel.remove();
return res;
}
@@ -92,7 +92,7 @@
throws NamingException, EquandaPersistenceException
{
SEL sel = getSelector();
- PROXY[] res = sel.findMultipleUOID( uoids );
+ PROXY[] res = sel.selectMultipleUOID( uoids );
sel.remove();
return res;
}
Deleted: trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -1,234 +0,0 @@
-/**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- */
-
-package org.equanda.persistence.om;
-
-import org.equanda.persistence.om.query.EquandaQuery;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Support methods for DMObjectFinder classes
- *
- * @author NetRom team
- */
-public abstract class ObjectFinder
-{
- protected static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery )
- {
- String queryString = addTypeFilter( equandaQuery.getQueryString(), equandaQuery.getTypeFilter() );
- Query query = em.createQuery( queryString );
- Map<String, Object> params = equandaQuery.getParameters();
- for ( String name : params.keySet() )
- {
- query.setParameter( name, params.get( name ) );
- }
- return query;
- }
-
- /**
- * Get the name of the selected object from the query
- *
- * @param query String representation of query
- * @return object name
- */
- protected static String getQueryObject( String query )
- {
- String obj;
- if ( query.toUpperCase().startsWith( "SELECT " ) )
- {
- obj = query.substring( 7, query.indexOf( " FROM " ) );
- }
- else
- {
- obj = query.substring( 0, query.indexOf( " FROM " ) );
- }
- if ( obj.toUpperCase().startsWith( "COUNT(" ) )
- {
- obj = obj.substring( 6, obj.indexOf( ")" ) );
- }
- if ( obj.toUpperCase().startsWith( "DISTINCT " ) )
- {
- obj = obj.substring( 9, obj.length() );
- }
- obj = obj.trim();
- return obj;
- }
-
- private static String addFilter( String query, String filter )
- {
- StringBuffer res = new StringBuffer( query );
- if ( filter == null ) return query;
-
- if ( query.indexOf( " ORDER " ) == -1 )
- {
- if ( query.indexOf( " WHERE " ) == -1 )
- {
- res.append( " WHERE " );
- res.append( filter );
- }
- else
- {
- res.append( " AND " );
- res.append( filter );
- }
- }
- else
- {
- int orderPos = query.indexOf( " ORDER " );
- String order = res.substring( orderPos );
- res.replace( orderPos, res.length(), "" );
- if ( res.indexOf( " WHERE " ) == -1 )
- {
- res.append( " WHERE " );
- res.append( filter );
- }
- else
- {
- res.append( " AND " );
- res.append( filter );
- }
- res.append( order );
- }
- return res.toString();
- }
-
- protected static String addTypeFilter( String query, ObjectType type )
- {
- if ( type == null ) return query;
- StringBuffer filter = new StringBuffer();
- Collection<String> types = type.getAllowedStringValues();
-
- // get selected object from query string
- String obj = getQueryObject( query );
-
- String sep = "";
- filter.append( obj );
- filter.append( ".equandaType in (" );
- for ( String t : types )
- {
- filter.append( sep );
- filter.append( '\'' );
- filter.append( t );
- filter.append( '\'' );
- sep = ",";
- }
- filter.append( ')' );
- return addFilter( query, filter.toString() );
- }
-
- /**
- * Get query string for the count query
- *
- * @param equandaQuery base query
- * @return count query string
- */
- public static String getRunCountQueryString( EquandaQuery equandaQuery )
- {
- String queryString;
- if ( equandaQuery.getCountQueryString() == null )
- {
- queryString = equandaQuery.getQueryString();
- }
- else
- {
- queryString = equandaQuery.getCountQueryString();
- }
-
- if ( queryString.indexOf( " ORDER BY " ) != -1 )
- {
- queryString = queryString.substring( 0, queryString.indexOf( " ORDER BY " ) );
- }
- queryString = addTypeFilter( queryString, equandaQuery.getTypeFilter() );
- String obj = getQueryObject( queryString );
- if ( !queryString.contains( "DISTINCT" ) )
- {
- queryString = queryString.replace( "SELECT " + obj + " FROM", "SELECT COUNT(" + obj + ") FROM" );
- }
- else
- {
- queryString =
- queryString.replace( "SELECT DISTINCT " + obj + " FROM", "SELECT COUNT(DISTINCT " + obj + ") FROM" );
-
- }
- return queryString;
- }
-
- /**
- * Run an update query (which could amongst others be used for bulk delete).
- *
- * @param em entity manager
- * @param equandaQuery query
- * @return number of affected records
- */
- public static long runUpdateQuery( EntityManager em, EquandaQuery equandaQuery )
- {
- Query query = getEquandaQuery( em, equandaQuery );
- for ( String name : equandaQuery.getParameters().keySet() )
- {
- query.setParameter( name, equandaQuery.getParameters().get( name ) );
- }
- return query.executeUpdate();
- }
-
- /**
- * Replaces/set the order by clause in a query with a new one
- * Used for the configured selectors sorting
- *
- * @param queryStr old query
- * @param fieldName new field for use with ORDER BY
- * @return the new calculated query
- */
- protected static String setOrderBy( String queryStr, String fieldName )
- {
- if ( queryStr.indexOf( " ORDER BY " ) != -1 )
- {
- queryStr = queryStr.substring( 0, queryStr.indexOf( " ORDER BY " ) );
- }
- queryStr += " ORDER BY " + getQueryObject( queryStr ) + "." + fieldName;
- return queryStr;
- }
-
- /**
- * Adds one extra filter to the query
- *
- * @param queryStr old query
- * @param name name of the filter
- * @param queryPart how filter is to be applied in the query
- * @return the new calculated query
- */
- protected static String setFilter( String queryStr, String name, String queryPart )
- {
- String value = SelectorsState.getFilter( name );
- if ( null != value )
- {
- queryPart = queryPart.replace( "${}", value );
- queryStr = addFilter( queryStr, queryPart );
- }
- return queryStr;
- }
-}
Copied: trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectSelector.java (from rev 114, trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java)
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectSelector.java (rev 0)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectSelector.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -0,0 +1,234 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.persistence.om;
+
+import org.equanda.persistence.om.query.EquandaQuery;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * Support methods for DMObjectSelector classes
+ *
+ * @author NetRom team
+ */
+public abstract class ObjectSelector
+{
+ protected static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery )
+ {
+ String queryString = addTypeFilter( equandaQuery.getQueryString(), equandaQuery.getTypeFilter() );
+ Query query = em.createQuery( queryString );
+ Map<String, Object> params = equandaQuery.getParameters();
+ for ( String name : params.keySet() )
+ {
+ query.setParameter( name, params.get( name ) );
+ }
+ return query;
+ }
+
+ /**
+ * Get the name of the selected object from the query
+ *
+ * @param query String representation of query
+ * @return object name
+ */
+ protected static String getQueryObject( String query )
+ {
+ String obj;
+ if ( query.toUpperCase().startsWith( "SELECT " ) )
+ {
+ obj = query.substring( 7, query.indexOf( " FROM " ) );
+ }
+ else
+ {
+ obj = query.substring( 0, query.indexOf( " FROM " ) );
+ }
+ if ( obj.toUpperCase().startsWith( "COUNT(" ) )
+ {
+ obj = obj.substring( 6, obj.indexOf( ")" ) );
+ }
+ if ( obj.toUpperCase().startsWith( "DISTINCT " ) )
+ {
+ obj = obj.substring( 9, obj.length() );
+ }
+ obj = obj.trim();
+ return obj;
+ }
+
+ private static String addFilter( String query, String filter )
+ {
+ StringBuffer res = new StringBuffer( query );
+ if ( filter == null ) return query;
+
+ if ( query.indexOf( " ORDER " ) == -1 )
+ {
+ if ( query.indexOf( " WHERE " ) == -1 )
+ {
+ res.append( " WHERE " );
+ res.append( filter );
+ }
+ else
+ {
+ res.append( " AND " );
+ res.append( filter );
+ }
+ }
+ else
+ {
+ int orderPos = query.indexOf( " ORDER " );
+ String order = res.substring( orderPos );
+ res.replace( orderPos, res.length(), "" );
+ if ( res.indexOf( " WHERE " ) == -1 )
+ {
+ res.append( " WHERE " );
+ res.append( filter );
+ }
+ else
+ {
+ res.append( " AND " );
+ res.append( filter );
+ }
+ res.append( order );
+ }
+ return res.toString();
+ }
+
+ protected static String addTypeFilter( String query, ObjectType type )
+ {
+ if ( type == null ) return query;
+ StringBuffer filter = new StringBuffer();
+ Collection<String> types = type.getAllowedStringValues();
+
+ // get selected object from query string
+ String obj = getQueryObject( query );
+
+ String sep = "";
+ filter.append( obj );
+ filter.append( ".equandaType in (" );
+ for ( String t : types )
+ {
+ filter.append( sep );
+ filter.append( '\'' );
+ filter.append( t );
+ filter.append( '\'' );
+ sep = ",";
+ }
+ filter.append( ')' );
+ return addFilter( query, filter.toString() );
+ }
+
+ /**
+ * Get query string for the count query
+ *
+ * @param equandaQuery base query
+ * @return count query string
+ */
+ public static String getRunCountQueryString( EquandaQuery equandaQuery )
+ {
+ String queryString;
+ if ( equandaQuery.getCountQueryString() == null )
+ {
+ queryString = equandaQuery.getQueryString();
+ }
+ else
+ {
+ queryString = equandaQuery.getCountQueryString();
+ }
+
+ if ( queryString.indexOf( " ORDER BY " ) != -1 )
+ {
+ queryString = queryString.substring( 0, queryString.indexOf( " ORDER BY " ) );
+ }
+ queryString = addTypeFilter( queryString, equandaQuery.getTypeFilter() );
+ String obj = getQueryObject( queryString );
+ if ( !queryString.contains( "DISTINCT" ) )
+ {
+ queryString = queryString.replace( "SELECT " + obj + " FROM", "SELECT COUNT(" + obj + ") FROM" );
+ }
+ else
+ {
+ queryString =
+ queryString.replace( "SELECT DISTINCT " + obj + " FROM", "SELECT COUNT(DISTINCT " + obj + ") FROM" );
+
+ }
+ return queryString;
+ }
+
+ /**
+ * Run an update query (which could amongst others be used for bulk delete).
+ *
+ * @param em entity manager
+ * @param equandaQuery query
+ * @return number of affected records
+ */
+ public static long runUpdateQuery( EntityManager em, EquandaQuery equandaQuery )
+ {
+ Query query = getEquandaQuery( em, equandaQuery );
+ for ( String name : equandaQuery.getParameters().keySet() )
+ {
+ query.setParameter( name, equandaQuery.getParameters().get( name ) );
+ }
+ return query.executeUpdate();
+ }
+
+ /**
+ * Replaces/set the order by clause in a query with a new one
+ * Used for the configured selectors sorting
+ *
+ * @param queryStr old query
+ * @param fieldName new field for use with ORDER BY
+ * @return the new calculated query
+ */
+ protected static String setOrderBy( String queryStr, String fieldName )
+ {
+ if ( queryStr.indexOf( " ORDER BY " ) != -1 )
+ {
+ queryStr = queryStr.substring( 0, queryStr.indexOf( " ORDER BY " ) );
+ }
+ queryStr += " ORDER BY " + getQueryObject( queryStr ) + "." + fieldName;
+ return queryStr;
+ }
+
+ /**
+ * Adds one extra filter to the query
+ *
+ * @param queryStr old query
+ * @param name name of the filter
+ * @param queryPart how filter is to be applied in the query
+ * @return the new calculated query
+ */
+ protected static String setFilter( String queryStr, String name, String queryPart )
+ {
+ String value = SelectorsState.getFilter( name );
+ if ( null != value )
+ {
+ queryPart = queryPart.replace( "${}", value );
+ queryStr = addFilter( queryStr, queryPart );
+ }
+ return queryStr;
+ }
+}
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/AbstractSelect.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/AbstractSelect.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/AbstractSelect.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -167,17 +167,17 @@
}
/**
- * Calculates signature for jboss.query and ejb.finder
+ * Calculates signature for jboss.query and ejb.selector
*
- * @param prefix prefix (PP in "findPPName")
+ * @param prefix prefix (PP in "selectPPName")
* @param limit should limit be included
- * @return query finder signature
+ * @return query selector signature
*/
String getSignature( String prefix, boolean limit )
{
TextBuilder signature = TextBuilder.newInstance();
- signature.append( "Collection find" );
+ signature.append( "Collection select" );
if ( prefix != null ) signature.append( prefix );
signature.append( getName() );
signature.append( '(' );
@@ -216,7 +216,7 @@
}
/**
- * Calculates query for ejb.finder
+ * Calculates query for ejb.selector
*
* @return ejbql query
*/
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -1640,7 +1640,7 @@
}
else if ( !root.getName().equals( tableRootName ) )
{
- // we dont' want to find same linkname in other tables
+ // we dont' want to select same linkname in other tables
for ( OMField f : root.getFields() )
{
if ( ( f.isLink() ) && ( f.getLinkName() != null ) )
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -269,11 +269,11 @@
if ( !hasSelect( "EquandaAll" ) )
{
// add EquandaAll select for all tables
- OMSelect findall = new OMSelect();
- findall.setName( "EquandaAll" );
- findall.setSecurityRole( getSecurityRole() );
- findall.setTableName( name );
- findall.setRootTable( this );
+ OMSelect selectall = new OMSelect();
+ selectall.setName( "EquandaAll" );
+ selectall.setSecurityRole( getSecurityRole() );
+ selectall.setTableName( name );
+ selectall.setRootTable( this );
ArrayList<OMField> fields = getFields();
for ( OMField field : fields )
{
@@ -287,11 +287,11 @@
query.append( name );
query.append( "Bean o ORDER BY o." );
query.append( field.getVarName() );
- findall.setQuery( query.toString() );
+ selectall.setQuery( query.toString() );
break;
}
}
- selects.add( findall );
+ selects.add( selectall );
}
return selects;
}
@@ -720,15 +720,15 @@
public void addSuggestSelect( OMField field )
{
- OMCustomSelect find = new OMCustomSelect();
- find.setOMField( field );
- TextBuilder findName = TextBuilder.newInstance();
- findName.append( "EquandaSuggest" );
- findName.append( field.getName() );
- find.setName( findName.toString() );
- find.setSecurityRole( getSecurityRole() );
- find.setTableName( name );
- find.setRootTable( this );
+ OMCustomSelect select = new OMCustomSelect();
+ select.setOMField( field );
+ TextBuilder selectName = TextBuilder.newInstance();
+ selectName.append( "EquandaSuggest" );
+ selectName.append( field.getName() );
+ select.setName( selectName.toString() );
+ select.setSecurityRole( getSecurityRole() );
+ select.setTableName( name );
+ select.setRootTable( this );
TextBuilder query = TextBuilder.newInstance();
query.append( "SELECT o FROM DM" );
@@ -738,11 +738,11 @@
query.append( field.getVarName() );
query.append( "=:" );
query.append( field.getVarName() );
- find.setQuery( query.toString() );
+ select.setQuery( query.toString() );
- if ( !suggestSelects.contains( find ) )
+ if ( !suggestSelects.contains( select ) )
{
- suggestSelects.add( find );
+ suggestSelects.add( select );
}
}
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMTable.java 2007-10-09 20:12:02 UTC (rev 115)
@@ -463,7 +463,7 @@
if ( node.getTagName().equals( "template" ) )
{
String pName = node.getAttribute( "parent" );
- OMTable template = findTemplate( pName );
+ OMTable template = selectTemplate( pName );
if ( template == null )
{
err( "table template " + pName + " not found" );
@@ -594,7 +594,7 @@
}
}
- // create finders
+ // create selectors
if ( tmpRef != null || tmpDesc != null )
{
if ( tmpRef != null )
@@ -605,7 +605,7 @@
addOMSelect( selStart );
root.addOMSelect( selStart );
OMSelect selEquals =
- new OMSelect( "EquandaFind" + tmpRef.getName(), this, getRoot(), tmpRef.getName(), false, true );
+ new OMSelect( "EquandaSelect" + tmpRef.getName(), this, getRoot(), tmpRef.getName(), false, true );
addOMSelect( selEquals );
root.addOMSelect( selEquals );
}
@@ -674,7 +674,7 @@
selects.add( sel );
}
- private OMTable findTemplate( String name )
+ private OMTable selectTemplate( String name )
{
Node node = this.getParentNode();
while ( node.getParentNode() != null ) node = node.getParentNode();
Modified: trunk/equanda-generate/src/main/resources/equanda.dtd
===================================================================
--- trunk/equanda-generate/src/main/resources/equanda.dtd 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-generate/src/main/resources/equanda.dtd 2007-10-09 20:12:02 UTC (rev 115)
@@ -447,7 +447,7 @@
<!--
- define a finder method which selects records based on the selection criteria
+ define a selector method which selects records based on the selection criteria
A select can either define criteria (selection tags), or define a list of subselects.
Subselects are a way to build brackets in the selection. The operator which has to be used can be specified.
The "TRY" operator is special. The subselects are tried in order.
@@ -489,9 +489,9 @@
field is used for the field to select on
EQUANDA_MODIFIED can be used as a selection too.
field cannot be link or calculated.
- table if the (root) table this field is part of, defaults to the table in which the finder is defined
+ table if the (root) table this field is part of, defaults to the table in which the selector is defined
path is the path which is used to get from the current table to the other table, defaults to the table attribute
- name is the variable name for the parameter on the finder method (defaults to the fields name)
+ name is the variable name for the parameter on the selector method (defaults to the fields name)
from in a possible extra part for the from clause in the EJB-QL statement
base is the base object which is added before the path (default "o")
test can be one of: =,!=,<,>,<=,>=,is null,is not null,like
@@ -512,7 +512,7 @@
parameter (true|false) "true">
<!--
- Query allow you to explicitly define the EJB-QL query which needs to be used for a finder.
+ Query allow you to explicitly define the EJB-QL query which needs to be used for a selector.
The (order and type of the) parameters are defined using the preceding selection tags.
-->
<!ELEMENT query (#PCDATA)>
@@ -552,8 +552,8 @@
<!--
- Suggest is something used in GUI, to show a default for a parameter of an action or finder.
- For finders and fields, the variants with field and field-with-path are not usable (there is no "current" object,
+ Suggest is something used in GUI, to show a default for a parameter of an action or selector.
+ For selectors and fields, the variants with field and field-with-path are not usable (there is no "current" object,
so you could reference a value of a field in it).
It can be:
Deleted: trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm 2007-10-08 15:18:41 UTC (rev 114)
+++ trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm 2007-10-09 20:12:02 UTC (rev 115)
@@ -1,302 +0,0 @@
-#**
- * This file is part of the equanda project.
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at http://www.mozilla.org/MPL/
- *
- * Code generated by applying this template can be freely used.
- *
- * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
- * ANY KIND, either express or implied. See the License for the specific language governing rights and
- * limitations under the License.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * Contributor(s):
- * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
- *#
-/**
- * This file is generated by equanda on $generationdate, do not modify
- */
-
-package ${package}.server.pm;
-
-import ${package}.client.*;
-import org.equanda.persistence.om.ObjectType;
-import org.equanda.persistence.om.query.EquandaQuery;
-import org.equanda.persistence.om.query.EquandaQueryImpl;
-import org.equanda.persistence.om.UOID;
-import org.equanda.persistence.om.SelectorsState;
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import java.util.List;
-import java.util.Collection;
-import java.util.ArrayList;
-
-/**
- * Utility class which combined the finders for $table.Name
- * $table.Description
- */
-public class DM${table.Name}Finder
- extends org.equanda.persistence.om.ObjectFinder
-{
-
-#macro( selectQueryParameters $select )
-#foreach( $sel in $select.Selections )
-#if( !$sel.VarName.equals("equandaLimit") && $sel.isParameter() && $sel.isTestComparison() )
- #set( $field=$sel.Field )
- #if( $field.isString() && $sel.Test.startsWith("like "))
- if ( $sel.VarName != null )
- {
- ${sel.VarName} = "$sel.Test.substring(5, $sel.Test.length())".replaceFirst("\\?", $sel.VarName);
- }
- #end
- query.setParameter( "${sel.VarName}", ${sel.VarName} );
-#end
-#end
-#end
-
-#macro( createSelect $select $table )
-#set( $list="List<DM${table.Name}Bean>" )
-#set( $return="List<DM${table.Name}Bean>" )
-#if( $select.isSingle() )#set( $return="DM${table.Name}Bean" )#end
-
-#if( $select.hasSubselects() && ( $select.Operator.equals("TRY") || $select.Operator.equals("ADD" ) ) )
- #set( $sep = ", " )
- #if ( $select.ParametersListWithTypes == "" )#set( $sep = "" )#end
- private static $list equanda${select.Name}( EntityManager em, ObjectType tf$sep$select.ParametersListWithTypes )
- {
- EquandaQuery query;
-#if ( $select.Operator=="TRY" )
-#foreach ($sub in $select.Subselects)
- query = EquandaGlobal.getQuery( "${table.Name}.${sub.Name}" );
- #selectQueryParameters( $sub )
- #if( $select.hasLimit() )
- query.setMaxResults( equandaLimit );
- #end
- #if( $select.isSingle() )
- query.setMaxResults( 1 );
- #end
- if ( tf != null ) query.setTypeFilter( tf );
- $list ret${sub.Name} = equandaRunQuery( em, query );
- if ( ret${sub.Name}.size()>0 ) return ret$sub.Name;
-#end ## foreach subselect
- return new ArrayList<DM${table.Name}Bean>();
-#end ## operator TRY
-#if ( $select.Operator=="ADD" )
- ArrayList<DM${table.Name}Bean> ret = new ArrayList<DM${table.Name}Bean>();
-#foreach ($sub in $select.Subselects)
- query = EquandaGlobal.getQuery( "${table.Name}.${sub.Name}" );
- #selectQueryParameters( $sub )
- #if( $select.hasLimit() )
- query.setMaxResults( equandaLimit );
- #end
- #if( $select.isSingle() )
- query.setMaxResults( 1 );
- #end
- if ( tf != null ) query.setTypeFilter( tf );
- $list ret${sub.Name} = equandaRunQuery( em, query );
- for ( DM${table.Name}Bean obj : ret${sub.Name} )
- {
- if ( !ret.contains( obj ) ) { ret.add( obj ); }
- }
-#end ## foreach subselect
-
-#if ( $select.hasOrders() )
- java.util.Comparator<DM${table.Name}Bean> comp=new java.util.Comparator<DM${table.Name}Bean>()
- {
- public int compare(DM${table.Name}Bean obj1, DM${table.Name}Bean obj2)
- {
-
- int ret=0;
-#foreach( $order in $select.OrderFields )
- if ( ret == 0 )
- {
- $order.JavaFieldType val1, val2;
- val1=obj1.get${order.Name}();
- val2=obj2.get${order.Name}();
-
-#if ( $order.isString() || $order.isTimestamp() || $order.isDate() )
- if ((val1!=null) && (val2!=null))
- ret=val1.compareTo(val2);
-#else
- if (val1<val2)
- ret=-1;
- if (val1>val2)
- ret=1;
-#end
- }
-#end
- return ret;
- }
-
- public boolean equals(Object obj)
- {
- return super.equals(obj);
- }
- };
- java.util.Collections.sort( ret, comp );
-#end
-#if ( $select.hasLimit() )
- if ( equandaLimit<0 )
- equandaLimit = 0;
- while (ret.size() > equandaLimit)
- ret.remove( ret.size()-1 );
-#end
- return ret;
-#end ## operator ADD
- }
-
- /*
- * $select.Description
- */
-#set( $sep = ", " )
-#if ( $select.ParametersListWithTypes == "" )#set( $sep = "" )#end
- public static $return find${select.Name}( EntityManager em, ObjectType tf$sep$select.ParametersListWithTypes )
- {
- EquandaQuery query;
- #set( $sep = ", " )
- #if( $select.ParametersListWithTypes == "")#set( $sep = "" )#end
- $list list = equanda${select.Name}( em, tf$sep$select.ParametersList );
-#if ( $select.isSingle() )
- if ( list.size() == 0 ) return null;
- return list.get( 0 );
-#else
- return list;
-#end
- }
-#else##select.hasSubSelects
- /*
- * $select.Description
- */
-#set( $sep = ", " )
-#if ( $select.ParametersListWithTypes == "" )#set( $sep = "" )#end
- public static EquandaQuery get${select.Name}Query( ObjectType tf$sep$select.ParametersListWithTypes )
- {
- EquandaQuery query = EquandaGlobal.getQuery( "${table.Name}.${select.Name}" );
- #selectQueryParameters( $select )
- #if( $select.hasLimit() )
- query.setMaxResults( equandaLimit );
- #end
- if ( tf != null ) query.setTypeFilter( tf );
- return query;
- }
-#end##select.hasSubSelects
-#end##macro createSelect
-
-#foreach( $select in $table.Selects )
- #createSelect( $select $table )
-#end
-
-#foreach( $select in $table.SuggestSelects )
- #createSelect( $select $table )
-#end
-
-// handle EquandaQuery
-public static List<DM${table.Name}Bean> equandaRunQuery( EntityManager em, EquandaQuery equandaQuery )
-{
- String sorting = SelectorsState.getSorting( "$table.Name" );
- Query query;
- #if( !$table.hasDataFilters() )
- if ( sorting == null || sorting.length() == 0 )
- {
- query = getEquandaQuery( em, equandaQuery );
- }
- else
- {
- #end
- String queryString = equandaQuery.getQueryString();
- queryString = setOrderBy( queryString, sorting );
- #if( $table.hasDataFilters() )
- queryString = setFilters( queryString );
- #end
-
- EquandaQuery calculatedQuery = new EquandaQueryImpl( queryString );
- query = getEquandaQuery(em, calculatedQuery);
- #if( !$table.hasDataFilters() )
- }
- #end
- if ( equandaQuery.getMaxResults() > 0 ) query.setMaxResults( equandaQuery.getMaxResults() );
-
- if ( equandaQuery.getFirstResult() > 0 ) query.setFirstResult( equandaQuery.getFirstResult() );
-
- for ( String name : equandaQuery.getParameters().keySet() )
- {
- query.setParameter( name, equandaQuery.getParameters().get( name ) );
- }
- return (List<DM${table.Name}Bean>) query.getResultList();
-}
-
-// count for uniqueness
-#foreach ($field in $table.Fields)
-#if ($field.isUnique())
- public static long count${field.Name}( EntityManager em, ${field.JavaFieldType} ${field.VarName} )
- {
- EquandaQuery query = EquandaGlobal.getQuery( "${table.Name}.equanda${field.Name}Unique" );
- query.setParameter( "${field.VarName}", ${field.VarName} );
- Query q = getEquandaQuery( em, query );
- return (Long)q.getResultList().get( 0 );
- }
-#end
-#end
-
- public static DM${table.Name}Bean findUOID(EntityManager em, UOID uoid)
- {
- // no flush needed, if the entity is already managed it is used directly
- // if it is not managed, then it cannot be dirty :-)
- return em.find( DM${table.Name}Bean.class, uoid );
- }
-
- /**
- * Apply the data-filters which are declared in the object model.
- *
- * @param queryString base query string
- * @return query string with filters applied
- */
- public static String setFilters( String queryString )
- {
- #if( !$table.hasDataFilters() )
- #foreach( $filter in $table.DataFilters.keySet() )
- queryString = setFilter( queryString, "$filter", "$table.DataFilters.get( $filter )" );
- #end
- #end
- return queryString;
- }
-
- /**
- * Count the (total) result size for a equanda select query.
- *
- * @param em entity manager
- * @param equandaQuery count query
- * @return result
- */
- public static List runCountQuery( EntityManager em, EquandaQuery equandaQuery )
- {
- // make sure the query will return the latest version of the data (including in-transaction changes)
- //em.flush();
-
- Query query;
- String queryString = getRunCountQueryString( equandaQuery );
- queryString = setFilters( queryString );
- query = em.createQuery( queryString );
-
- for ( String name : equandaQuery.getParameters().keySet() )
- {
- query.setParameter( name, equandaQuery.getParameters().get( name ) );
- }
-
- return query.getResultList();
- }
-
-}
Copied: trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm (from rev 114, trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm)
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm 2007-10-09 20:12:02 UTC (rev 115)
@@ -0,0 +1,302 @@
+#**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Code generated by applying this template can be freely used.
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * Contributor(s):
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ *#
+/**
+ * This file is generated by equanda on $generationdate, do not modify
+ */
+
+package ${package}.server.pm;
+
+import ${package}.client.*;
+import org.equanda.persistence.om.ObjectType;
+import org.equanda.persistence.om.query.EquandaQuery;
+import org.equanda.persistence.om.query.EquandaQueryImpl;
+import org.equanda.persistence.om.UOID;
+import org.equanda.persistence.om.SelectorsState;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.util.List;
+import java.util.Collection;
+import java.util.ArrayList;
+
+/**
+ * Utility class which combined the selectors for $table.Name
+ * $table.Description
+ */
+public class DM${table.Name}Selector
+ extends org.equanda.persistence.om.ObjectSelector
+{
+
+#macro( selectQueryParameters $select )
+#foreach( $sel in $select.Selections )
+#if( !$sel.VarName.equals("equandaLimit") && $sel.isParameter() && $sel.isTestComparison() )
+ #set( $field=$sel.Field )
+ #if( $field.isString() && $sel.Test.startsWith("like "))
+ if ( $sel.VarName != null )
+ {
+ ${sel....
[truncated message content] |
|
From: <tri...@us...> - 2007-10-08 15:18:43
|
Revision: 114
http://equanda.svn.sourceforge.net/equanda/?rev=114&view=rev
Author: triathlon98
Date: 2007-10-08 08:18:41 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
fix for multiple link fields
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Input.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java 2007-10-08 12:50:40 UTC (rev 113)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/EquandaList.java 2007-10-08 15:18:41 UTC (rev 114)
@@ -524,7 +524,7 @@
for ( E e : this )
{
if ( sep != 0 ) tb.append( sep );
- tb.append( e.toString() );
+ if ( e != null ) tb.append( e.toString() );
sep = ',';
}
tb.append( ']' );
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java 2007-10-08 12:50:40 UTC (rev 113)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java 2007-10-08 15:18:41 UTC (rev 114)
@@ -65,7 +65,7 @@
return DisplayMode.EDIT;
}
- /**
+ /*
* ******* Common for both interfaces(EquandaSimpleInputContainer, EquandaLinkInputContainer): ***********
*/
@@ -226,7 +226,7 @@
{
if ( isEmbedded() )
{
- return new EmbeddedFieldSelectionModel( getFieldBinder(), getDescription(), this );
+ return new EmbeddedFieldSelectionModel( getFieldBinder(), this );
}
if ( isLinkGUILookCombobox() )
{
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Input.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Input.java 2007-10-08 12:50:40 UTC (rev 113)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Input.java 2007-10-08 15:18:41 UTC (rev 114)
@@ -47,7 +47,7 @@
String caseConversionClass;
String linkTableName;
private String tableName;
- private String onChange; // @todo onchange should not be a sepparate case, informalParameters should be used
+ private String onChange; // @todo onchange should not be a separate case, informalParameters should be used
// informal parameters could be stuff like javascript event handlers... They should be copy in tapestry components as they are
private Map<String, String> informalParameters = new HashMap<String, String>();
Renderer renderer = new Renderer();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java 2007-10-08 12:50:40 UTC (rev 113)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/EmbeddedFieldSelectionModel.java 2007-10-08 15:18:41 UTC (rev 114)
@@ -3,7 +3,6 @@
import org.equanda.persistence.om.EquandaProxy;
import org.equanda.tapestry.binder.FieldBinder;
import org.equanda.tapestry.components.input.equandaLinkInput.LinkInputBinderWrapper;
-import org.equanda.tapestry.model.Input;
import org.equanda.tapestry.util.EquandaProxyAccessor;
import org.apache.tapestry.IComponent;
@@ -20,19 +19,15 @@
public class EmbeddedFieldSelectionModel
implements org.apache.tapestry.form.IPropertySelectionModel
{
- private org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( getClass() );
-
private FieldBinder fieldBinder;
- private Input fieldDescription;
private IComponent resolver;
private List<String> uoid;
private List<String> display;
- public EmbeddedFieldSelectionModel( FieldBinder fieldBinder, Input fieldDescription, IComponent resolver )
+ public EmbeddedFieldSelectionModel( FieldBinder fieldBinder, IComponent resolver )
{
this.fieldBinder = fieldBinder;
- this.fieldDescription = fieldDescription;
this.resolver = resolver;
init();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-08 12:50:43
|
Revision: 113
http://equanda.svn.sourceforge.net/equanda/?rev=113&view=rev
Author: triathlon98
Date: 2007-10-08 05:50:40 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
EQ-67 fix default renderer for clob field, assure renderer is copied from template, cimplify layout css (less verbose), small code improvements
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
trunk/equanda-t4-template/src/main/webapp/css/layout.css
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Renderer.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/FieldType.java
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-10-08 10:04:23 UTC (rev 112)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-10-08 12:50:40 UTC (rev 113)
@@ -151,7 +151,6 @@
static
{
attributeConstraints.put( "type", new AttributeConstraints( "string", null ) );
- attributeConstraints.put( "renderer", new AttributeConstraints( "default", null ) );
attributeConstraints.put( "priority", new AttributeConstraints( "5", null ) );
}
@@ -1693,15 +1692,15 @@
}
if ( !isString() && ( ( isReference() || isDescription() ) ) )
{
- err("is not a string field, so it cannot be a reference or description field" );
+ err( "is not a string field, so it cannot be a reference or description field" );
}
if ( isLink() && ( isReference() || isDescription() ) )
{
- err("is a link field, so it cannot be a reference or description field" );
+ err( "is a link field, so it cannot be a reference or description field" );
}
if ( isCalculated() && ( isReference() || isDescription() ) )
{
- err("is a calculated field, so it cannot be a reference or description field" );
+ err( "is a calculated field, so it cannot be a reference or description field" );
}
if ( hasMutableEvenIf() )
{
@@ -1715,7 +1714,7 @@
OMField f = root.getField( mi.fieldname );
if ( f == null )
{
- err("mutable-even-if constraint, field " + mi.fieldname + " not found" );
+ err( "mutable-even-if constraint, field " + mi.fieldname + " not found" );
}
//@todo does a constraint for a field need to be boolean or not?
//else
@@ -1745,7 +1744,7 @@
OMField f = root.getField( mi.fieldname );
if ( f == null )
{
- err("immutable-if constraint, field " + mi.fieldname + " not found" );
+ err( "immutable-if constraint, field " + mi.fieldname + " not found" );
}
//@todo does a constraint for a field need to be boolean or not?
//else
@@ -1799,6 +1798,7 @@
}
}
}
+ if ( renderer == null ) renderer = "default";
}
public boolean doValidation()
Modified: trunk/equanda-t4-template/src/main/webapp/css/layout.css
===================================================================
--- trunk/equanda-t4-template/src/main/webapp/css/layout.css 2007-10-08 10:04:23 UTC (rev 112)
+++ trunk/equanda-t4-template/src/main/webapp/css/layout.css 2007-10-08 12:50:40 UTC (rev 113)
@@ -4,7 +4,7 @@
* | |-----------------------------------------------------| |
* | | defaultField | |
* | | |-------------------- ------------------------- | |
- * | | |defaulFieldLabel | |defaultFieldValue | | |
+ * | | |defaultLabel | |defaultValue | | |
* | | | | | | | |
* | | |-------------------- ------------------------- | |
* | |-----------------------------------------------------| |
@@ -28,22 +28,22 @@
.defaultField {
display: table-row; width: 100%; text-align: center; padding-top: 0cm; padding-bottom: 0cm;
}
-.defaultFieldLabel {
+.defaultLabel {
display: table-cell; text-align: left; width: 30%;
}
-.defaultFieldValue {
+.defaultValue {
display: table-cell; text-align: left; width: 70%;
}
-.defaultBigFieldValue {
+.defaultBigValue {
display: table-cell; text-align: left;
}
.defaultMultipleField {
display: table-row; width: 100%; text-align: center;
}
-.defaultMultipleFieldLabel {
+.defaultMultipleLabel {
display: table-cell; text-align: left; width: 30%; vertical-align: top;
}
-.defaultMultipleFieldValue {
+.defaultMultipleValue {
display: table-cell; text-align: left; width: 70%;
}
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java 2007-10-08 10:04:23 UTC (rev 112)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java 2007-10-08 12:50:40 UTC (rev 113)
@@ -44,7 +44,7 @@
public abstract class EquandaField2
extends EquandaBaseComponent
{
- /**
+ /*
* ********************************* Parameter definitions: ***********************************
*/
@@ -179,13 +179,12 @@
{
if ( isMultiple() )
{
- return "defaultMultipleFieldLabel " + getTableName() + "MultipleField_Label " + getTableName() + "_" +
+ return "defaultMultipleLabel " + getTableName() + "MultipleLabel " + getTableName() + "_" +
getFieldName() + "_Label";
}
else
{
- return "defaultFieldLabel " + getTableName() + "Field_Label " + getTableName() + "_" + getFieldName() +
- "_Label";
+ return "defaultLabel " + getTableName() + "Label " + getTableName() + "_" + getFieldName() + "_Label";
}
}
@@ -193,18 +192,17 @@
{
if ( isMultiple() )
{
- return "defaultMultipleFieldValue " + getTableName() + "MultipleField_Value " + getTableName() + "_" +
- getFieldName() + "_Value";
+ return "defaultMultipleValue " + getTableName() + "MultipleValue " + getTableName() + "_" +
+ getFieldName() + "Value";
}
else
{
- String fieldValue = "defaultFieldValue ";
+ String fieldValue = "defaultValue ";
if ( getFieldDescription().getRenderer() != null && getFieldDescription().getRenderer().isTypeWiki() )
{
- fieldValue = "defaultBigFieldValue ";
+ fieldValue = "defaultBigValue ";
}
- return fieldValue + getTableName() + "Field_Value " + getTableName() + "_" + getFieldName() +
- "_Value";
+ return fieldValue + getTableName() + "Value " + getTableName() + "_" + getFieldName() + "_Value";
}
}
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-10-08 10:04:23 UTC (rev 112)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-10-08 12:50:40 UTC (rev 113)
@@ -314,9 +314,7 @@
public boolean isTextLineField()
{
- return
- ( getFieldType() == FieldType.TYPE_STRING && ( getRenderer() == null || getRenderer().isTypeDefault() ) ||
- getRenderer().isTypePassword() ) || isInt() || isDouble();
+ return isString() || isInt() || isDouble();
}
public boolean isInt()
@@ -327,7 +325,7 @@
public boolean isString()
{
- return getFieldType() == FieldType.TYPE_STRING || getRenderer().isTypePassword();
+ return getFieldType().isStringBased() || getRenderer().isTypePassword();
}
public boolean isDouble()
@@ -338,8 +336,7 @@
public boolean isTextareaField()
{
- return ( getFieldType() == FieldType.TYPE_STRING || getFieldType() == FieldType.TYPE_CLOB ) &&
- getRenderer().isTypeText();
+ return getFieldType().isStringBased() && getRenderer().isTypeText();
}
public String getRows()
@@ -374,8 +371,7 @@
public boolean isWikiField()
{
- return ( getFieldType() == FieldType.TYPE_STRING || getFieldType() == FieldType.TYPE_CLOB ) &&
- getRenderer().isTypeWiki();
+ return getFieldType().isStringBased() && getRenderer().isTypeWiki();
}
public boolean hasChoicesForGui()
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Renderer.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Renderer.java 2007-10-08 10:04:23 UTC (rev 112)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/model/Renderer.java 2007-10-08 12:50:40 UTC (rev 113)
@@ -54,35 +54,36 @@
public Renderer( String str )
{
String[] tokens = str.split( "," );
- if ( tokens[ 0 ].toUpperCase().equals( "TEXT" ) )
+ String first = tokens[ 0 ].toUpperCase();
+ if ( "TEXT".equals( first ) )
{
type = RENDERER_TYPE_TEXT;
}
- else if ( tokens[ 0 ].toUpperCase().equals( "PASSWORD" ) )
+ else if ( "PASSWORD".equals( first ) )
{
type = RENDERER_TYPE_PASSWORD;
}
- else if ( tokens[ 0 ].toUpperCase().equals( "WIKI" ) )
+ else if ( "WIKI".equals( first ) )
{
type = RENDERER_TYPE_WIKI;
}
- else if ( tokens[ 0 ].toUpperCase().equals( "BLOB" ) )
+ else if ( "BLOB".equals( first ) )
{
type = RENDERER_TYPE_BLOB;
}
- else if ( tokens[ 0 ].toUpperCase().equals( "DEFAULT" ) )
+ else if ( "DEFAULT".equals( first ) )
{
type = RENDERER_TYPE_DEFAULT;
}
- else if ( tokens[ 0 ].toUpperCase().equals( "INT" ) )
+ else if ( "INT".equals( first ) )
{
type = RENDERER_TYPE_INT;
}
- else if ( tokens[ 0 ].toUpperCase().equals( "DOUBLE" ) )
+ else if ( "DOUBLE".equals( first ) )
{
type = RENDERER_TYPE_DOUBLE;
}
- else if ( tokens[ 0 ].toUpperCase().equals( "TIME" ) )
+ else if ( "TIME".equals( first ) )
{
type = RENDERER_TYPE_TIME;
}
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/FieldType.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/FieldType.java 2007-10-08 10:04:23 UTC (rev 112)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/FieldType.java 2007-10-08 12:50:40 UTC (rev 113)
@@ -31,62 +31,71 @@
*/
public enum FieldType
{
- TYPE_INT( "int", int.class ){
- public Object parse( String string )
+ TYPE_INT( "int", int.class )
{
- return Integer.parseInt( string );
- }
- },
- TYPE_DOUBLE( "double", double.class ){
- public Object parse( String string )
+ public Object parse( String string )
+ {
+ return Integer.parseInt( string );
+ }
+ },
+ TYPE_DOUBLE( "double", double.class )
{
- return Double.parseDouble( string );
- }
- },
- TYPE_STRING( "string", String.class ){
- public Object parse( String string )
+ public Object parse( String string )
+ {
+ return Double.parseDouble( string );
+ }
+ },
+ TYPE_STRING( "string", String.class )
{
- return string;
- }
- },
- TYPE_BOOLEAN( "boolean", boolean.class ){
- public Object parse( String string )
+ public Object parse( String string )
+ {
+ return string;
+ }
+ },
+ TYPE_BOOLEAN( "boolean", boolean.class )
{
- return Boolean.parseBoolean( string );
- }
- },
- TYPE_DATE( "date", java.sql.Date.class ){
- public Object parse( String string )
+ public Object parse( String string )
+ {
+ return Boolean.parseBoolean( string );
+ }
+ },
+ TYPE_DATE( "date", java.sql.Date.class )
{
- return java.sql.Date.valueOf( string );
- }
- },
- TYPE_TIMESTAMP( "timestamp", java.sql.Timestamp.class ){
- public Object parse( String string )
+ public Object parse( String string )
+ {
+ return java.sql.Date.valueOf( string );
+ }
+ },
+ TYPE_TIMESTAMP( "timestamp", java.sql.Timestamp.class )
{
- return java.sql.Timestamp.valueOf( string );
- }
- },
- TYPE_BLOB( "blob", byte[].class ){
- public Object parse( String string )
+ public Object parse( String string )
+ {
+ return java.sql.Timestamp.valueOf( string );
+ }
+ },
+ TYPE_BLOB( "blob", byte[].class )
{
- return string;
- }
- },
- TYPE_CLOB( "clob", String.class ){
- public Object parse( String string )
+ public Object parse( String string )
+ {
+ return string;
+ }
+ },
+ TYPE_CLOB( "clob", String.class )
{
- return string;
- }
- },
+ public Object parse( String string )
+ {
+ return string;
+ }
+ },
- TYPE_LINK( "link", null ){
- public Object parse( String string )
+ TYPE_LINK( "link", null )
{
- return null;
- }
- };
+ public Object parse( String string )
+ {
+ return null;
+ }
+ };
String type;
Class class_;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-08 10:04:24
|
Revision: 112
http://equanda.svn.sourceforge.net/equanda/?rev=112&view=rev
Author: triathlon98
Date: 2007-10-08 03:04:23 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Hide parent node of fieldset too. (Sometimes it's a fieldset directly in a table, and hiding just the fieldset will cause blank spaces...)
Modified Paths:
--------------
trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/components/equandaType/EquandaType.script
Modified: trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/components/equandaType/EquandaType.script
===================================================================
--- trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/components/equandaType/EquandaType.script 2007-10-08 09:55:15 UTC (rev 111)
+++ trunk/equanda-tapestry4/src/main/resources/org/equanda/tapestry/components/equandaType/EquandaType.script 2007-10-08 10:04:23 UTC (rev 112)
@@ -38,6 +38,11 @@
if (item!=null)
{
item.style.display=display;
+ if (item.id.substring(0,2)=="fs")
+ {
+ var pn=item.parentNode;
+ pn.style.display=display;
+ }
}
}
}
@@ -51,7 +56,14 @@
{
var item=document.getElementById(invisible[i][1][j]);
if (item!=null)
+ {
item.style.display="none";
+ if (item.id.substring(0,2)=="fs")
+ {
+ var pn=item.parentNode;
+ pn.style.display="none";
+ }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-08 09:55:18
|
Revision: 111
http://equanda.svn.sourceforge.net/equanda/?rev=111&view=rev
Author: triathlon98
Date: 2007-10-08 02:55:15 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
Fix to focus the first record in forms
Modified Paths:
--------------
trunk/equanda-t4-template/src/main/webapp/AutoFocus.js
trunk/equanda-t4-template/src/main/webapp/FormScript.js
Modified: trunk/equanda-t4-template/src/main/webapp/AutoFocus.js
===================================================================
--- trunk/equanda-t4-template/src/main/webapp/AutoFocus.js 2007-10-08 08:31:18 UTC (rev 110)
+++ trunk/equanda-t4-template/src/main/webapp/AutoFocus.js 2007-10-08 09:55:15 UTC (rev 111)
@@ -7,12 +7,12 @@
elem=form.elements[i];
if (((elem.tagName=="INPUT" ) && ((elem.type=="text") || (elem.type=="checkbox"))) || (elem.tagName=="SELECT"))
{
- if ((elem.style.display!="none") && (elem.disabled==false))
+ if ((elem.style.display!="none") && (elem.disabled==false) && (elem.className!="displayNone"))
{
td=elem.parentNode;
tr=td.parentNode;
tbody=tr.parentNode;
- if ((td.style.display!="none") && (tr.style.display!="none") && (tbody.style.display!="none"))
+ if ((td.style.display!="none") && (td.className!="displayNone") && (tr.style.display!="none") && (tr.className!="displayNone") && (tbody.style.display!="none") && (tbody.className!="displayNone"))
{
elem.focus();
if (elem.tagName=="INPUT") elem.select();
Modified: trunk/equanda-t4-template/src/main/webapp/FormScript.js
===================================================================
--- trunk/equanda-t4-template/src/main/webapp/FormScript.js 2007-10-08 08:31:18 UTC (rev 110)
+++ trunk/equanda-t4-template/src/main/webapp/FormScript.js 2007-10-08 09:55:15 UTC (rev 111)
@@ -140,7 +140,7 @@
if ( event.which == 13 &&
( (( input.type == "submit" ) || ( input.type == "button" )) && hasClass(input, SUBMIT_CLASS) ) )
{
- input.form[pos].click();
+ input.click();
return false;
}
if ( event.which == 13 && input.tagName == 'TEXTAREA' )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-08 08:31:20
|
Revision: 110
http://equanda.svn.sourceforge.net/equanda/?rev=110&view=rev
Author: triathlon98
Date: 2007-10-08 01:31:18 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
fix types and warnings
Modified Paths:
--------------
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/Border.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/EquandaPagination.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/ParameterInputContainerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/borderItems/BorderItems.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaView/EquandaView.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/DescriptionInputContainerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInputContainer.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/main/MasterDetailBaseComponent.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/tableDescriptionEntity/TableDescriptionEntityComponent.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/tableDescriptionHeader/TableDescriptionHeaderComponent.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/navigation/entityUsageMenu/EntityUsageMenu.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/navigation/navigationHelper/NavigationHelper.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/SelectInputContainerImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configItem/ConfigItem.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/actionRights/ActionRights.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/rightsInput/RightsInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/masterDetail/TableMasterDetailBasePage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/adminReportsConfig/AdminReportsConfig.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/adminTablesConfig/AdminTablesConfig.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/ReportNamesComparator.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/TranslationComparator.java
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/Border.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/Border.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/Border.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -257,7 +257,7 @@
getPage().getLocale().getLanguage() + ", but should be " + language );
return false;
}
- log.error( "Refreshing page" );
+ log.debug( "Refreshing page" );
visit.setRefreshDone( true );
return true;
}
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/EquandaPagination.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/EquandaPagination.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/EquandaPagination.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -15,13 +15,13 @@
//private static final Logger log = Logger.getLogger( Pagination.class );
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaPagination.html" )
public abstract IAsset get$template();
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "currentPage", required = true )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/ParameterInputContainerImpl.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/ParameterInputContainerImpl.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/ParameterInputContainerImpl.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -43,7 +43,7 @@
extends CommonInputContainerImpl
{
/**
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "actionObject", required = true )
public abstract ActionObject getActionObject();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaAction/EquandaAction.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -82,7 +82,7 @@
/*
- * ************************************ Bean defintions: *************************************
+ * ************************************ Bean definitions: *************************************
*/
@Bean( EquandaFormValidator.class )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -39,7 +39,7 @@
extends ParameterInputContainerImpl
{
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/action/equandaParameter/EquandaParameter.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/borderItems/BorderItems.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/borderItems/BorderItems.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/borderItems/BorderItems.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -78,7 +78,7 @@
public abstract int getImageHeight();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/borderItems/BorderItems.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaEdit/EquandaEdit.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -56,14 +56,14 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( EquandaEdit.class );
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaEdit/EquandaEdit.html" )
public abstract IAsset get$template();
/*
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract String getAction();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaField/EquandaField2.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -45,7 +45,7 @@
extends EquandaBaseComponent
{
/**
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "proxy", required = true )
@@ -64,7 +64,7 @@
public abstract boolean isCheckPrefs();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaField/EquandaField2.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaGroup/EquandaGroup.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -46,21 +46,21 @@
extends PageGroupCommons
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "groupDescription" )
public abstract GMGroup getGroupDescription();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaGroup/EquandaGroup.html" )
public abstract IAsset get$template();
/*
- * ********************************* Property defintions: ***********************************
+ * ********************************* Property definitions: ***********************************
*/
public abstract GMGroup getGroupDescriptionNested();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -54,7 +54,7 @@
extends EquandaBaseComponent
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "proxy" )
@@ -67,14 +67,14 @@
public abstract boolean isSubmit();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaLinkSelects/EquandaLinkSelects.html" )
public abstract IAsset get$template();
/*
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract LinkedSelect getMoreLinkedSelect();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaPage/EquandaPage.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -53,14 +53,14 @@
public abstract GMPage getPageDescription();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaPage/EquandaPage.html" )
public abstract IAsset get$template();
/**
- * Property defintions :
+ * Property definitions :
*/
public abstract GMGroup getGroupDescription();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaTable/EquandaTable.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -57,7 +57,7 @@
extends EquandaBaseComponent
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "proxy", required = true )
@@ -82,11 +82,11 @@
public abstract boolean isPagination();
/*
- * *********************************** Bean defintions: **************************************
+ * *********************************** Bean definitions: **************************************
*/
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaTable/EquandaTable.html" )
@@ -96,7 +96,7 @@
public abstract IAsset getEquandaTableScript();
/*
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract GMPage getPageDescription();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaType/EquandaType.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -47,7 +47,7 @@
implements ValidatableField
{
/**
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "tableDescription" )
public abstract GMTable getTableDescription();
@@ -68,7 +68,7 @@
public abstract boolean isHidden();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaType/EquandaType.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaView/EquandaView.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaView/EquandaView.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/equandaView/EquandaView.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -41,7 +41,7 @@
extends AddViewEditCommons
{
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/equandaView/EquandaView.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/CommonInputContainerImpl.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -92,15 +92,15 @@
public boolean isDisabled()
{
- if ( getInternalDisplayMode() == DisplayMode.VIEW ) return true;
- if ( getDescription().isCalculated() || getDescription().isAuto() ) return true;
- if ( getInternalDisplayMode() == DisplayMode.EDIT && getDescription().isImmutable() ) return true;
- return false;
+ return getInternalDisplayMode() == DisplayMode.VIEW ||
+ getDescription().isCalculated() ||
+ getDescription().isAuto() ||
+ ( getInternalDisplayMode() == DisplayMode.EDIT && getDescription().isImmutable() );
}
public boolean isRequired()
{
- return getFieldType().isBoolean() ? false : getDescription().isRequired();
+ return !getFieldType().isBoolean() && getDescription().isRequired();
}
public ArrayList<Validator> getValidatorList()
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/DescriptionInputContainerImpl.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/DescriptionInputContainerImpl.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/DescriptionInputContainerImpl.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -43,7 +43,7 @@
extends CommonInputContainerImpl
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "proxy", required = true )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -33,7 +33,7 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( EquandaAttachment.class );
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "fieldName", required = true )
@@ -64,7 +64,7 @@
public abstract Map<String, String> getInformalParameters();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/input/equandaAttachment/EquandaAttachment.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaInput/EquandaInput.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -48,7 +48,7 @@
implements ValidatableField
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "proxy", required = true )
@@ -61,18 +61,18 @@
public abstract DisplayMode getDisplayMode();
/*
- * ************************************ Bean defintions: *************************************
+ * ************************************ Bean definitions: *************************************
*/
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/input/equandaInput/EquandaInput.html" )
public abstract IAsset get$template();
/*
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
/*
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -69,7 +69,7 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( EquandaLinkInput.class );
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "fieldName", required = true )
@@ -168,7 +168,7 @@
public abstract int getCaseConversionDescription();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/input/equandaLinkInput/EquandaLinkInput.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -55,7 +55,7 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( EquandaMultipleField.class );
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/input/equandaMultipleField/EquandaMultipleField.html" )
@@ -66,7 +66,7 @@
/*
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract int getIndex();
@@ -102,7 +102,7 @@
public abstract PropertySelection getNoOfAddsDropList();
- /**
+ /*
* ************************************ Utility methods: *************************************
*/
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -67,7 +67,7 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( EquandaSimpleInput.class );
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "fieldType", defaultValue = "getDefaultFieldType()" )
@@ -128,7 +128,7 @@
public abstract Map<String, String> getInformalParameters();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInputContainer.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInputContainer.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInputContainer.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -43,7 +43,7 @@
*/
public interface EquandaSimpleInputContainer
{
- /**
+ /*
* ********************************* Component definitions: **********************************
*/
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -39,7 +39,7 @@
extends DescriptionInputContainerImpl
{
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/input/equandaSingleField/EquandaSingleField.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -56,7 +56,7 @@
{
/**
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "dateFieldId", required = true )
@@ -115,7 +115,7 @@
public abstract boolean isRequired();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -71,7 +71,7 @@
public abstract int getCols();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/input/equandaWikiInput/EquandaWikiInput.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/main/MasterDetailBaseComponent.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/main/MasterDetailBaseComponent.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/main/MasterDetailBaseComponent.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -70,7 +70,7 @@
public abstract boolean getShowBaseButtons();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/masterDetail/main/MasterDetailBaseComponent.html" )
@@ -80,14 +80,14 @@
public abstract IAsset getMasterDetailScript();
/*
- * ************************************ Bean defintions: *************************************
+ * ************************************ Bean definitions: *************************************
*/
@Bean( EquandaFormValidator.class )
public abstract ValidationDelegate getValidationDelegate();
/*
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract void setError( String error );
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/tableDescriptionEntity/TableDescriptionEntityComponent.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/tableDescriptionEntity/TableDescriptionEntityComponent.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/tableDescriptionEntity/TableDescriptionEntityComponent.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -22,7 +22,7 @@
extends EquandaBaseComponent
{
/**
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "parameter", required = true )
@@ -36,7 +36,7 @@
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset(
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/tableDescriptionHeader/TableDescriptionHeaderComponent.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/tableDescriptionHeader/TableDescriptionHeaderComponent.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/masterDetail/tableDescriptionHeader/TableDescriptionHeaderComponent.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -21,7 +21,7 @@
extends EquandaBaseComponent
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "parameter", required = true )
@@ -31,7 +31,7 @@
public abstract DisplayMode getDisplayMode();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset(
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/navigation/entityUsageMenu/EntityUsageMenu.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/navigation/entityUsageMenu/EntityUsageMenu.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/navigation/entityUsageMenu/EntityUsageMenu.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -80,7 +80,7 @@
public abstract String getShowEdit();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/navigation/entityUsageMenu/EntityUsageMenu.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/navigation/navigationHelper/NavigationHelper.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/navigation/navigationHelper/NavigationHelper.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/navigation/navigationHelper/NavigationHelper.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -61,7 +61,7 @@
public abstract void setIndex( int index );
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/navigation/navigationHelper/NavigationHelper.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/SelectInputContainerImpl.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/SelectInputContainerImpl.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/SelectInputContainerImpl.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -41,7 +41,7 @@
extends CommonInputContainerImpl
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "selectObject", required = true )
public abstract SelectObject getSelectObject();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -47,7 +47,7 @@
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( EquandaSelect.class );
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "selectObject" )
@@ -74,14 +74,14 @@
public abstract boolean isSortAscending();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/select/equandaSelect/EquandaSelect.html" )
public abstract IAsset get$template();
/*
- * ************************************ Bean defintions: *************************************
+ * ************************************ Bean definitions: *************************************
*/
@Bean( EquandaFormValidator.class )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -39,7 +39,7 @@
extends SelectInputContainerImpl
{
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/select/equandaSelectField/EquandaSelectField.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -56,14 +56,14 @@
public abstract GMSelect getSelectDescription();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/select/equandaSelectParameters/EquandaSelectParameters.html" )
public abstract IAsset get$template();
/**
- * Property defintions :
+ * Property definitions :
*/
public abstract GMSelection getSelectionDescription();
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -111,7 +111,7 @@
public abstract void setSortAscending( boolean type );
/*
- * Property defintions :
+ * Property definitions :
*/
public abstract EquandaProxy getRowProxy();
@@ -147,7 +147,7 @@
public abstract void setError( String s );
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/select/equandaSelectResults/EquandaSelectResults.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/shared/AddViewEditCommons.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -53,7 +53,7 @@
private org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( getClass() );
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "proxy" )
@@ -65,14 +65,14 @@
public abstract GMTable getTableDescription();
/*
- * ************************************ Bean defintions: *************************************
+ * ************************************ Bean definitions: *************************************
*/
@Bean( EquandaFormValidator.class )
public abstract ValidationDelegate getValidationDelegate();
/*
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract void setError( String error );
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configItem/ConfigItem.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configItem/ConfigItem.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configItem/ConfigItem.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -42,7 +42,7 @@
private org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( getClass() );
/**
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "key", required = true )
@@ -62,7 +62,7 @@
}
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/configItem/ConfigItem.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/configList/ConfigList.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -82,7 +82,7 @@
public abstract Item getCurrentItem();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/configList/ConfigList.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -52,7 +52,7 @@
implements ValidatableField
{
/**
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "tableDescription", required = true )
@@ -83,7 +83,7 @@
public abstract String getDisplayName();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/preferences/preferenceInput/PreferenceInput.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -59,14 +59,14 @@
public abstract GMTable getTableDescription();
/**
- * ************************************ Bean defintions: *************************************
+ * ************************************ Bean definitions: *************************************
*/
@Bean( EquandaFormValidator.class )
public abstract ValidationDelegate getValidationDelegate();
/**
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract void setError( String error );
@@ -74,7 +74,7 @@
public abstract String getError();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/preferences/tablePreferences/TablePreferences.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/actionRights/ActionRights.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/actionRights/ActionRights.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/actionRights/ActionRights.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -53,7 +53,7 @@
implements ValidatableField
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "fieldRights", required = true )
@@ -63,7 +63,7 @@
public abstract GMTable getTableDescription();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/table/actionRights/ActionRights.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/rightsInput/RightsInput.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/rightsInput/RightsInput.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/rightsInput/RightsInput.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -47,8 +47,8 @@
extends EquandaBaseComponent
implements ValidatableField
{
- /**
- * ********************************* Parameter defintions: ***********************************
+ /*
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "key", required = true )
@@ -63,14 +63,14 @@
@Parameter( name = "showDisplayName", required = true )
public abstract boolean getShowDisplayName();
- /**
- * ********************************** Assets defintions: *************************************
+ /*
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/table/rightsInput/RightsInput.html" )
public abstract IAsset get$template();
- /**
+ /*
* ********************************* Component definitions: **********************************
*/
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -53,7 +53,7 @@
implements ValidatableField
{
/*
- * ********************************* Parameter defintions: ***********************************
+ * ********************************* Parameter definitions: ***********************************
*/
@Parameter( name = "fieldRights", required = true )
@@ -63,7 +63,7 @@
public abstract GMTable getTableDescription();
/*
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -69,21 +69,21 @@
public abstract GMTable getTableDescription();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/table/tableRights/TableRights.html" )
public abstract IAsset get$template();
/**
- * ************************************ Bean defintions: *************************************
+ * ************************************ Bean definitions: *************************************
*/
@Bean( EquandaFormValidator.class )
public abstract ValidationDelegate getValidationDelegate();
/**
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract void setError( String error );
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -52,7 +52,7 @@
public abstract boolean isTdLayout();
/**
- * ********************************** Assets defintions: *************************************
+ * ********************************** Assets definitions: *************************************
*/
@Asset( value = "/org/equanda/tapestry/components/userAdmin/userAdminQuickAccess/UserAdminQuickAccess.html" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/masterDetail/TableMasterDetailBasePage.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/masterDetail/TableMasterDetailBasePage.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/masterDetail/TableMasterDetailBasePage.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -27,14 +27,14 @@
{
/*
- * ************************************ Bean defintions: *************************************
+ * ************************************ Bean definitions: *************************************
*/
@Bean( EquandaFormValidator.class )
public abstract ValidationDelegate getValidationDelegate();
/*
- * ********************************** Property defintions: ***********************************
+ * ********************************** Property definitions: ***********************************
*/
public abstract void setError( String error );
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2007-10-08 07:42:30 UTC (rev 109)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/userAdmin/adminBorderConfig/AdminBorderConfig.java 2007-10-08 08:31:18 UTC (rev 110)
@@ -71,7 +71,7 @@
return names;
}
- /**
+ /*
* Provides the list of report labels (for internationalization)
*/
public ArrayList getLabels()
Modified: trunk/equanda-tapest...
[truncated message content] |
|
From: <tri...@us...> - 2007-10-08 07:42:34
|
Revision: 109
http://equanda.svn.sourceforge.net/equanda/?rev=109&view=rev
Author: triathlon98
Date: 2007-10-08 00:42:30 -0700 (Mon, 08 Oct 2007)
Log Message:
-----------
fix some problems in user interface
Modified Paths:
--------------
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/NavigationablePageImpl.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/TapestryHome.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/tableManager/TableManagerPage.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/LinkFieldSelectionModel.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/EquandaProxyAccessor.java
trunk/src/site/wiki/ExpectedAmount.wiki
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.java 2007-10-07 10:13:14 UTC (rev 108)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/userAdmin/table/selectRights/SelectRights.java 2007-10-08 07:42:30 UTC (rev 109)
@@ -101,7 +101,7 @@
}
}
String sname = sel.getName();
- if ( sname.regionMatches( true, 0, "equanda", 0, 4 ) && !sname.equalsIgnoreCase( "equandaAll" ) )
+ if ( sname.regionMatches( true, 0, "Equanda", 0, 4 ) && !sname.equals( "EquandaAll" ) )
{
continue;
}
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/NavigationablePageImpl.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/NavigationablePageImpl.java 2007-10-07 10:13:14 UTC (rev 108)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/navigation/NavigationablePageImpl.java 2007-10-08 07:42:30 UTC (rev 109)
@@ -24,12 +24,6 @@
package org.equanda.tapestry.navigation;
-import org.equanda.tapestry.pages.EquandaBasePage;
-import org.equanda.tapestry.util.Global;
-import org.equanda.tapestry.util.EquandaProxyAccessor;
-import org.equanda.persistence.om.SelectorsState;
-import org.equanda.persistence.om.EquandaProxy;
-import org.equanda.login.LoginInfo;
import org.apache.log4j.Logger;
import org.apache.tapestry.IEngine;
import org.apache.tapestry.IMarkupWriter;
@@ -38,9 +32,14 @@
import org.apache.tapestry.contrib.ajax.XTile;
import org.apache.tapestry.event.PageBeginRenderListener;
import org.apache.tapestry.event.PageEvent;
-
-import java.util.List;
+import org.equanda.persistence.om.EquandaProxy;
+import org.equanda.persistence.om.SelectorsState;
+import org.equanda.tapestry.pages.EquandaBasePage;
+import org.equanda.tapestry.util.EquandaProxyAccessor;
+import org.equanda.tapestry.util.Global;
+import org.equanda.util.StringUtil;
import java.lang.reflect.Method;
+import java.util.List;
/**
* Basic navigationable page.
@@ -73,15 +72,9 @@
public void setNavigationEntry( String entryId, NavigationEntry navEntry )
{
navigationEntry = (NavigationEntry<PP>) navEntry;
- if ( !equalsNull( entryId, getEntryId() ) ) setEntryId( entryId );
+ if ( !StringUtil.objectEquals( entryId, getEntryId() ) ) setEntryId( entryId );
}
- private boolean equalsNull( String entryId, String entryId1 )
- {
- if ( entryId == null ) return entryId1 == null;
- return entryId.equals( entryId1 );
- }
-
public PP getPageParameters()
{
return navigationEntry != null ? navigationEntry.getPageParameters() : null;
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/TapestryHome.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/TapestryHome.java 2007-10-07 10:13:14 UTC (rev 108)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/TapestryHome.java 2007-10-08 07:42:30 UTC (rev 109)
@@ -24,14 +24,12 @@
package org.equanda.tapestry.pages;
+import org.apache.tapestry.event.PageBeginRenderListener;
+import org.apache.tapestry.event.PageEvent;
+import org.apache.tapestry.RedirectException;
import org.equanda.persistence.om.EquandaProxy;
import org.equanda.tapestry.parser.border.Parser;
import org.equanda.tapestry.util.EquandaProxyAccessor;
-import org.apache.tapestry.RedirectException;
-import org.apache.tapestry.event.PageBeginRenderListener;
-import org.apache.tapestry.event.PageEvent;
-
-import java.lang.reflect.InvocationTargetException;
import java.util.List;
/**
@@ -47,59 +45,44 @@
public void pageBeginRender( PageEvent pageEvent )
{
+ String destination = "app?service=page&page=DefaultHome";
try
{
EquandaProxy user;
- List<EquandaProxy> results = EquandaProxyAccessor.find( "EquandaUser", "UserName", new Class[]{ String.class },
- new String[]{ getSessionUserAdmin().getUserName() } );
+ List<EquandaProxy> results =
+ EquandaProxyAccessor.find( "EquandaUser", "UserName", new Class[]{ String.class },
+ new String[]{ getSessionUserAdmin().getUserName() } );
- if ( results == null || results.size() == 0 )
+ if ( results != null && results.size() > 0 )
{
- throw new RedirectException( "app?service=page&page=DefaultHome" );
- }
- user = results.get( 0 );
- String startPage = (String) EquandaProxyAccessor.getField( user, "StartPage" );
- if ( startPage == null )
- {
- throw new RedirectException( "app?service=page&page=DefaultHome" );
- }
- List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
- for ( Parser.ItemDescription item : items )
- {
- if ( startPage.equals( item.getKey() ) )
+ user = results.get( 0 );
+ String startPage = (String) EquandaProxyAccessor.getField( user, "StartPage" );
+ if ( startPage != null )
{
- throw new RedirectException( item.getPage() );
- }
- for ( Parser.ItemDescription subItem : item.getItems() )
- {
- if ( startPage.equals( subItem.getKey() ) )
+ List<Parser.ItemDescription> items = getVisitObject().getBorderItems();
+ for ( Parser.ItemDescription item : items )
{
- throw new RedirectException( subItem.getPage() );
- }
+ if ( startPage.equals( item.getKey() ) )
+ {
+ destination = item.getPage();
+ }
+ for ( Parser.ItemDescription subItem : item.getItems() )
+ {
+ if ( startPage.equals( subItem.getKey() ) )
+ {
+ destination = subItem.getPage();
+ }
+ }
+ }
}
}
- throw new RedirectException( "app?service=page&page=DefaultHome" );
}
- catch ( NoSuchMethodException nsme )
+ catch ( Exception e )
{
- log.error( nsme, nsme );
+ log.error( e, e );
}
- catch ( IllegalAccessException iae )
- {
- log.error( iae, iae );
- }
- catch ( InvocationTargetException ite )
- {
- log.error( ite, ite );
- }
- catch ( InstantiationException ie )
- {
- log.error( ie, ie );
- }
- catch ( ClassNotFoundException cnfe )
- {
- log.error( cnfe, cnfe );
- }
+ log.debug( "redirecting to " + destination );
+ throw new RedirectException( destination );
}
}
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/tableManager/TableManagerPage.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/tableManager/TableManagerPage.java 2007-10-07 10:13:14 UTC (rev 108)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/pages/tableManager/TableManagerPage.java 2007-10-08 07:42:30 UTC (rev 109)
@@ -86,7 +86,7 @@
if ( filterSet ) continue;
}
String sname = select.getName();
- if ( sname.regionMatches( true, 0, "equanda", 0, 4 ) && !sname.equalsIgnoreCase( "equandaAll" ) )
+ if ( sname.regionMatches( true, 0, "Equanda", 0, 4 ) && !sname.equalsIgnoreCase( "EquandaAll" ) )
{
continue;
}
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/LinkFieldSelectionModel.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/LinkFieldSelectionModel.java 2007-10-07 10:13:14 UTC (rev 108)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/selectionModel/LinkFieldSelectionModel.java 2007-10-08 07:42:30 UTC (rev 109)
@@ -93,7 +93,7 @@
List<EquandaProxy> results;
try
{
- results = EquandaProxyAccessor.find( fieldDescription.getLinkTableName(), "equandaAll", null, null );
+ results = EquandaProxyAccessor.find( fieldDescription.getLinkTableName(), "EquandaAll", null, null );
}
catch ( Exception e )
{
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java 2007-10-07 10:13:14 UTC (rev 108)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/useradmin/GlobalUserAdmin.java 2007-10-08 07:42:30 UTC (rev 109)
@@ -22,8 +22,8 @@
{
private static final Logger log = Logger.getLogger( GlobalUserAdmin.class );
- public static final String TABLE_EQUANDA_USER_NAME = "EquandaUser";
- public static final String TABLE_EQUANDA_ROLE_NAME = "EquandaRole";
+ public static final String TABLE_USER = "EquandaUser";
+ public static final String TABLE_ROLE = "EquandaRole";
UserAdminCache userAdminCache;
@@ -53,7 +53,7 @@
users = new Hashtable<String, ArrayList<String>>();
try
{
- List<EquandaProxy> userList = EquandaProxyAccessor.find( TABLE_EQUANDA_USER_NAME, "AllUsers", null, null );
+ List<EquandaProxy> userList = EquandaProxyAccessor.find( TABLE_USER, "AllUsers", null, null );
for ( EquandaProxy user : userList )
{
String userName = (String) EquandaProxyAccessor.getField( user, "UserName" );
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/EquandaProxyAccessor.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/EquandaProxyAccessor.java 2007-10-07 10:13:14 UTC (rev 108)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/util/EquandaProxyAccessor.java 2007-10-08 07:42:30 UTC (rev 109)
@@ -30,7 +30,9 @@
{
private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger( EquandaProxyAccessor.class );
- public static final String SELECTOR_UTIL_SUFFIX = "SelectorEJBUtil";
+ public static final String GLOBAL_CLASS = "EquandaGlobal";
+ public static final String GLOBAL_GET = "get";
+ public static final String GLOBAL_SELECTOR = "Selector";
public static final String FINDER_PREFIX = "find";
public static Object getField( EquandaProxy proxy, String fieldName )
@@ -213,9 +215,9 @@
return ResourceUtil.getConfigString( "ejb-client-package" ) + tableName;
}
- public static String getSelectorUtilFullName( String tableName )
+ public static String getFullGlobalClassName()
{
- return ResourceUtil.getConfigString( "ejb-client-package" ) + tableName + SELECTOR_UTIL_SUFFIX;
+ return ResourceUtil.getConfigString( "ejb-client-package" ) + GLOBAL_CLASS;
}
public static String getDisplay( EquandaProxy proxy, String... excludeFields )
@@ -287,9 +289,13 @@
throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException,
InvocationTargetException
{
- Class selectorUtilClass = getClassFor( getSelectorUtilFullName( tableName ) );
- Object selectorUtil = selectorUtilClass.newInstance();
- return (EquandaSelector) selectorUtilClass.getMethod( "get" ).invoke( selectorUtil );
+ Class globalClass = getClassFor( getFullGlobalClassName());
+ Object equanaGlobal = globalClass.newInstance();
+ TextBuilder tb = TextBuilder.newInstance();
+ tb.append( GLOBAL_GET );
+ tb.append( tableName );
+ tb.append( GLOBAL_SELECTOR );
+ return (EquandaSelector) globalClass.getMethod( tb.toString() ).invoke( equanaGlobal );
}
public static synchronized FieldType getFieldType( Input description )
Modified: trunk/src/site/wiki/ExpectedAmount.wiki
===================================================================
--- trunk/src/site/wiki/ExpectedAmount.wiki 2007-10-07 10:13:14 UTC (rev 108)
+++ trunk/src/site/wiki/ExpectedAmount.wiki 2007-10-08 07:42:30 UTC (rev 109)
@@ -9,7 +9,7 @@
!Differences:
-1) Tables with small/medium amount of records have an extra select added automatically. The name is "equandaAll". This select has no selections, so it gets all the records in that table.
+1) Tables with small/medium amount of records have an extra select added automatically. The name is "EquandaAll". This select has no selections, so it gets all the records in that table.
2) The look of link fields in GUI depends on the expected amount of records of the link table.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-07 10:13:17
|
Revision: 108
http://equanda.svn.sourceforge.net/equanda/?rev=108&view=rev
Author: triathlon98
Date: 2007-10-07 03:13:14 -0700 (Sun, 07 Oct 2007)
Log Message:
-----------
fix possible index out of bounds exception
Modified Paths:
--------------
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-10-05 09:56:38 UTC (rev 107)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-10-07 10:13:14 UTC (rev 108)
@@ -185,7 +185,14 @@
}
else
{
- res = tableName.substring( 0, 5 );
+ if ( tableName.length() <= 5 )
+ {
+ res = tableName;
+ }
+ else
+ {
+ res = tableName.substring( 0, 5 );
+ }
}
int count = 1;
String base = res;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-05 09:56:52
|
Revision: 107
http://equanda.svn.sourceforge.net/equanda/?rev=107&view=rev
Author: triathlon98
Date: 2007-10-05 02:56:38 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
remove xdocletname usage
Modified Paths:
--------------
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/AbstractSelect.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelect.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelection.java
trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSubselect.java
trunk/equanda-generate/src/main/velocity/ejb3/EquandaGlobal.java.vm
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/AbstractSelect.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/AbstractSelect.java 2007-10-05 09:37:45 UTC (rev 106)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/AbstractSelect.java 2007-10-05 09:56:38 UTC (rev 107)
@@ -64,7 +64,7 @@
numberOfParameters = 0;
for ( int i = 0; i < getSelections().size() ; i++ )
{
- if ( ( (OMSelection) getSelections().get( i ) ).isTestComparison() )
+ if ( ( getSelections().get( i ) ).isTestComparison() )
{
numberOfParameters++;
}
@@ -79,7 +79,7 @@
char sep = ' ';
for ( int i = 0; i < getSelections().size() ; i++ )
{
- OMSelection selection = (OMSelection) getSelections().get( i );
+ OMSelection selection = getSelections().get( i );
if ( selection.isTestComparison() )
{
if ( selection.isParameter() || !checkSelectionIsParameter )
@@ -131,10 +131,10 @@
/**
* Calculates query for jboss.query
*
- * @param order
- * @param ascending
- * @param limit
- * @return
+ * @param order different order fields
+ * @param ascending indication for each order field whether it is ascending
+ * @param limit should limit be included
+ * @return jboss query
*/
String getJbossQuery( ArrayList<String> order, ArrayList<Boolean> ascending, boolean limit )
{
@@ -169,9 +169,9 @@
/**
* Calculates signature for jboss.query and ejb.finder
*
- * @param prefix
- * @param limit
- * @return
+ * @param prefix prefix (PP in "findPPName")
+ * @param limit should limit be included
+ * @return query finder signature
*/
String getSignature( String prefix, boolean limit )
{
@@ -186,7 +186,7 @@
int cnt = 1;
for ( int i = 0; i < getSelections().size() ; i++ )
{
- OMSelection selection = (OMSelection) getSelections().get( i );
+ OMSelection selection = getSelections().get( i );
if ( selection.isTestComparison() )
{
signature.append( sep );
@@ -218,7 +218,7 @@
/**
* Calculates query for ejb.finder
*
- * @return
+ * @return ejbql query
*/
public String getEjbQlQuery()
{
@@ -261,12 +261,12 @@
ejbQlQuery.append( sel.getBase() );
if ( !sel.getBase().equals( "" ) ) ejbQlQuery.append( '.' );
ejbQlQuery.append( sel.getQlPath() );
- ejbQlQuery.append( sel.getField().getXDocletName() );
+ ejbQlQuery.append( sel.getField().getVarName() );
ejbQlQuery.append( ' ' );
ejbQlQuery.append( test );
ejbQlQuery.append( " ) " );
- qsep = getOperator();
+ qsep = getOperator();
}
}
else
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-10-05 09:37:45 UTC (rev 106)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMField.java 2007-10-05 09:56:38 UTC (rev 107)
@@ -78,7 +78,7 @@
// general info
String parentName; // name of the parent (a table name or include-data) - used for providing clear error messages
- String name, varName, xDocletName, dbName;
+ String name, varName, dbName;
String singular;
String defaultValue; // default value for field, including assignment operator
boolean owner; // this field is the owner in a bidirectional link
@@ -280,15 +280,7 @@
}
}
this.name = val;
- this.xDocletName = java.beans.Introspector.decapitalize( val );
- if ( value.equals( val.toUpperCase() ) )
- {
- this.varName = val;
- }
- else
- {
- this.varName = val.substring( 0, 1 ).toLowerCase() + val.substring( 1 );
- }
+ this.varName = java.beans.Introspector.decapitalize( val );
if ( val.toUpperCase().startsWith( "EQUANDA" ) || val.toUpperCase().startsWith( "UOID" )
|| value.charAt( 0 ) == '_' )
{
@@ -875,11 +867,6 @@
return varName;
}
- public String getXDocletName()
- {
- return xDocletName;
- }
-
public String getDbName()
{
return dbName;
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java 2007-10-05 09:37:45 UTC (rev 106)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMRootTable.java 2007-10-05 09:56:38 UTC (rev 107)
@@ -286,7 +286,7 @@
query.append( "SELECT o FROM DM" );
query.append( name );
query.append( "Bean o ORDER BY o." );
- query.append( field.getXDocletName() );
+ query.append( field.getVarName() );
findall.setQuery( query.toString() );
break;
}
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelect.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelect.java 2007-10-05 09:37:45 UTC (rev 106)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelect.java 2007-10-05 09:56:38 UTC (rev 107)
@@ -390,7 +390,6 @@
OMField field = new OMField();
field.name = "EquandaModificationDate";
field.varName = "equandaModificationDate";
- field.xDocletName = "equandaModificationDate";
field.type = OMField.TYPE_TIMESTAMP;
orderFields.add( field );
}
@@ -399,7 +398,6 @@
OMField field = new OMField();
field.name = "EquandaCreationDate";
field.varName = "equandaCreationDate";
- field.xDocletName = "equandaCreationDate";
field.type = OMField.TYPE_TIMESTAMP;
orderFields.add( field );
}
@@ -408,7 +406,6 @@
OMField field = new OMField();
field.name = "EquandaStatus";
field.varName = "equandaStatus";
- field.xDocletName = "equandaStatus";
field.type = OMField.TYPE_STRING;
orderFields.add( field );
}
@@ -968,9 +965,7 @@
public boolean equals( Object obj )
{
- if ( !( obj instanceof OMSelect ) ) return false;
- if ( name.equals( ( (OMSelect) obj ).getName() ) ) return true;
- return false;
+ return obj instanceof OMSelect && name.equals( ( (OMSelect) obj ).getName() );
}
public String getViewFilter() { return viewFilter; }
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelection.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelection.java 2007-10-05 09:37:45 UTC (rev 106)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSelection.java 2007-10-05 09:56:38 UTC (rev 107)
@@ -201,7 +201,6 @@
omField.name = "equandaModificationDate";
varName = "equandaModificationDate";
omField.varName = "equandaModificationDate";
- omField.xDocletName = "equandaModificationDate";
omField.type = OMField.TYPE_TIMESTAMP;
omField.table = parentTable;
omField.equandaType = "timestamp";
@@ -214,7 +213,6 @@
omField.name = "equandaCreationDate";
varName = "equandaCreationDate";
omField.varName = "equandaCreationDate";
- omField.xDocletName = "equandaCreationDate";
omField.type = OMField.TYPE_TIMESTAMP;
return omField;
}
@@ -225,7 +223,6 @@
omField.name = "equandaStatus";
varName = "equandaStatus";
omField.varName = "equandaStatus";
- omField.xDocletName = "equandaStatus";
omField.type = OMField.TYPE_STRING;
return omField;
}
Modified: trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSubselect.java
===================================================================
--- trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSubselect.java 2007-10-05 09:37:45 UTC (rev 106)
+++ trunk/equanda-generate/src/main/java/org/equanda/persistence/xml/OMSubselect.java 2007-10-05 09:56:38 UTC (rev 107)
@@ -26,14 +26,12 @@
import org.equanda.util.SaveException;
import org.equanda.util.xml.tree.*;
+import java.util.ArrayList;
+import java.util.Map;
import javolution.lang.TextBuilder;
import javolution.util.FastMap;
import javolution.xml.sax.Attributes;
-import java.util.ArrayList;
-import java.util.Map;
-
-
/**
* representation of a <subselect> node
*
@@ -52,8 +50,8 @@
private String name;
private String query;
private int inTag;
- private ArrayList subselects;
- private ArrayList selections;
+ private ArrayList<OMSubselect> subselects;
+ private ArrayList<OMSelection> selections;
private String parametersList;
private static String[] childrenList = { "description", "subselect", "if", "selection", "query" };
@@ -105,31 +103,31 @@
return operator;
}
- public ArrayList getSelections()
+ public ArrayList<OMSelection> getSelections()
{
if ( selections != null ) return selections;
NodeList nl = getNodesByTagName( "selection" );
- selections = new ArrayList( nl.getLength() );
+ selections = new ArrayList<OMSelection>( nl.getLength() );
for ( int i = 0; i < nl.getLength(); i++ )
{
if ( nl.item( i ).getParentNode() == this )
{
- selections.add( nl.item( i ) );
+ selections.add( (OMSelection)nl.item( i ) );
}
}
return selections;
}
- public ArrayList getSubselects()
+ public ArrayList<OMSubselect> getSubselects()
{
if ( subselects != null ) return subselects;
NodeList nl = getNodesByTagName( "subselect" );
- subselects = new ArrayList( nl.getLength() );
+ subselects = new ArrayList<OMSubselect>( nl.getLength() );
for ( int i = 0; i < nl.getLength(); i++ )
{
if ( nl.item( i ).getParentNode() == this )
{
- subselects.add( nl.item( i ) );
+ subselects.add( (OMSubselect)nl.item( i ) );
}
}
return subselects;
@@ -141,7 +139,6 @@
{
gen.setFailed( true );
SaveException.error( "A subselect has both subselects and selections " );
- return;
}
}
@@ -236,16 +233,14 @@
TextBuilder ejbQlQuery = TextBuilder.newInstance();
if ( !hasSubselects() )
{
- OMSelect select = (OMSelect) this.getParentNode();
String qsep = " ";
for ( int i = 0; i < getSelections().size(); i++ )
{
- OMSelection sel = (OMSelection) getSelections().get( i );
- String test = null;
+ OMSelection sel = getSelections().get( i );
+ String test;
if ( sel.isTestComparison() )
{
- //test = sel.convertTest( "?" + select.getSelectionIndex( sel ) );
- test = sel.convertTest( ":" + sel.getField().getXDocletName() );
+ test = sel.convertTest( ":" + sel.getField().getVarName() );
}
else
{
@@ -256,7 +251,7 @@
ejbQlQuery.append( sel.getBase() );
ejbQlQuery.append( '.' );
ejbQlQuery.append( sel.getQlPath() );
- ejbQlQuery.append( sel.getField().getXDocletName() );
+ ejbQlQuery.append( sel.getField().getVarName() );
ejbQlQuery.append( ' ' );
ejbQlQuery.append( test );
ejbQlQuery.append( " ) " );
@@ -270,7 +265,7 @@
{
ejbQlQuery.append( qsep );
ejbQlQuery.append( " ( " );
- ejbQlQuery.append( ( (OMSubselect) getSubselects().get( i ) ).getEjbQlSubQuery() );
+ ejbQlQuery.append( ( getSubselects().get( i ) ).getEjbQlSubQuery() );
ejbQlQuery.append( " ) " );
qsep = operator;
}
Modified: trunk/equanda-generate/src/main/velocity/ejb3/EquandaGlobal.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/EquandaGlobal.java.vm 2007-10-05 09:37:45 UTC (rev 106)
+++ trunk/equanda-generate/src/main/velocity/ejb3/EquandaGlobal.java.vm 2007-10-05 09:56:38 UTC (rev 107)
@@ -133,7 +133,7 @@
#foreach ($field in $table.Fields)
#if ($field.isUnique())
- queryStrings.put( "${table.Name}.equanda${field.Name}Unique", "SELECT COUNT(p) FROM DM${table.Name}Bean p WHERE p.${field.XDocletName} = :${field.VarName}" );
+ queryStrings.put( "${table.Name}.equanda${field.Name}Unique", "SELECT COUNT(p) FROM DM${table.Name}Bean p WHERE p.${field.VarName} = :${field.VarName}" );
#end
#end ## foreach select
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-05 09:37:48
|
Revision: 106
http://equanda.svn.sourceforge.net/equanda/?rev=106&view=rev
Author: triathlon98
Date: 2007-10-05 02:37:45 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
EQ-44 base for om-doc report plugin (compiles but causes strange exception when run)
Modified Paths:
--------------
trunk/equanda-maven-plugin/pom.xml
trunk/pom.xml
Added Paths:
-----------
trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/OmReportPlugin.java
Modified: trunk/equanda-maven-plugin/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/pom.xml 2007-10-05 09:35:51 UTC (rev 105)
+++ trunk/equanda-maven-plugin/pom.xml 2007-10-05 09:37:45 UTC (rev 106)
@@ -37,5 +37,13 @@
<groupId>org.equanda</groupId>
<artifactId>equanda-tool</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ </dependency>
</dependencies>
</project>
Added: trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/OmReportPlugin.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/OmReportPlugin.java (rev 0)
+++ trunk/equanda-maven-plugin/src/main/java/org/equanda/plugin/OmReportPlugin.java 2007-10-05 09:37:45 UTC (rev 106)
@@ -0,0 +1,162 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
+package org.equanda.plugin;
+
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.reporting.AbstractMavenReport;
+import org.apache.maven.reporting.MavenReportException;
+import org.codehaus.doxia.sink.Sink;
+import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.equanda.util.INIFile;
+import org.equanda.generate.Generator;
+
+import java.util.Locale;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Create reports with the object model in various formats (html, mm (freemind), ...)
+ *
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
+ * @goal omreport
+ * @phase site
+ * @description equanda maven plugin to generate site report for object model description
+ */
+public class OmReportPlugin
+ extends AbstractMavenReport
+{
+ /**
+ * Location where generated html will be created.
+ *
+ * @parameter expression="${project.reporting.outputDirectory}"
+ */
+ private String outputDirectory;
+
+ /**
+ * Doxia Site Renderer
+ *
+ * @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}"
+ * @required @readonly
+ */
+ private SiteRenderer siteRenderer;
+
+ /**
+ * Maven Project
+ *
+ * @parameter expression="${project}"
+ * @required @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * The filename to use for the report.
+ *
+ * @parameter expression="${outputName}" default-value="omdoc"
+ * @required
+ */
+ private String outputName;
+
+ /**
+ * @parameter expression="${basedir}/src/main/om"
+ * @required
+ */
+ private String sourceDirectory;
+
+ /**
+ * @parameter expression="om.ini"
+ * @required
+ */
+ private String configurationFile;
+
+ /**
+ * @parameter expression="docs"
+ */
+ private String template;
+
+ protected String getOutputDirectory()
+ {
+ return outputDirectory;
+ }
+
+ protected SiteRenderer getSiteRenderer()
+ {
+ return siteRenderer;
+ }
+
+ protected MavenProject getProject()
+ {
+ return project;
+ }
+
+ public String getDescription( Locale locale )
+ {
+ return "Object Model (om) description";
+ }
+
+ public String getName( Locale locale )
+ {
+ return "omreport";
+ }
+
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ protected void executeReport( Locale locale )
+ throws MavenReportException
+ {
+ String outFiles = outputDirectory;
+ if ( !outFiles.endsWith( File.separator ) ) outFiles += File.separatorChar;
+ outFiles += outputName;
+
+ // build directories etc
+
+ INIFile ini;
+ String iniName = sourceDirectory + File.separatorChar + configurationFile;
+ try
+ {
+ ini = new INIFile( iniName );
+ }
+ catch ( IOException ioe )
+ {
+ throw new MavenReportException( "Could not read configuration file", ioe );
+ }
+ ini.addValue( "config", "outputdir", outFiles );
+ ini.addValue( "config", "template", template );
+
+ Generator generator = new Generator( ini, sourceDirectory );
+ generator.generate();
+ if ( generator.getFailed() )
+ {
+ throw new MavenReportException( "equanda generation failed" );
+ }
+
+ // include project main page
+ String mainPage = "<html><head><title>om-doc</title></head><body>object model documents</body>";
+ Sink sink = getSink();
+ sink.rawText( mainPage );
+ }
+}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-10-05 09:35:51 UTC (rev 105)
+++ trunk/pom.xml 2007-10-05 09:37:45 UTC (rev 106)
@@ -149,7 +149,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -412,6 +412,16 @@
<artifactId>staticwiki-renderer</artifactId>
<version>0.4</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>2.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<repositories>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-05 09:35:58
|
Revision: 105
http://equanda.svn.sourceforge.net/equanda/?rev=105&view=rev
Author: triathlon98
Date: 2007-10-05 02:35:51 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
EQ-65 create data model "ontology"
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/docs.ini
Added Paths:
-----------
trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm
Added: trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm (rev 0)
+++ trunk/equanda-generate/src/main/velocity/docs/ontology.owl.vm 2007-10-05 09:35:51 UTC (rev 105)
@@ -0,0 +1,85 @@
+#**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Code generated by applying this template can be freely used.
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * @author Joachim Van der Auwera
+ *
+ *#<?xml version="1.0"?>
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:owl="http://www.w3.org/2002/07/owl#"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
+ xmlns="http://synergetics.be/cempetencies.owl#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xml:base="http://equanda.org/ontology.owl">
+ <owl:Ontology rdf:about=""/>
+#foreach( $table in $tables )
+#if( !${table.Name.startsWith("Equanda")} )
+<owl:Class rdf:ID="${table.Name}"/>
+#foreach( $stable in $table.Children )
+#if( !$table.isRoot() )
+<owl:Class rdf:ID="${stable.Name}">
+ <rdfs:subClassOf><owl:Class rdf:ID="${table.Name}"/></rdfs:subClassOf>
+</owl:Class>
+#end
+#end
+#end
+#end
+#foreach( $table in $tables )
+#if( !${table.Name.startsWith("Equanda")} )
+<owl:Class rdf:ID="${table.Name}"/>
+#foreach( $field in $table.Fields )
+#if( !${field.Name.startsWith("equanda")} )
+#if( $field.isLink() )
+<owl:ObjectProperty rdf:ID="has${field.Name}">
+ <rdfs:domain rdf:resource="#${table.Name}"/>
+ <rdfs:range rdf:resource="#${field.FieldTypeName}"/>
+</owl:ObjectProperty>
+#else
+<owl:DatatypeProperty rdf:ID="has${field.Name}">
+ <rdfs:domain rdf:resource="#${table.Name}"/>
+#if( $field.isString() )
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+#elseif( $field.isInt() )
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#integer"/>
+#elseif( $field.isBoolean() )
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
+#elseif( $field.isDate() )
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#date"/>
+#elseif( $field.isTimestamp() )
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#dateTime"/>
+#elseif( $field.isDouble() )
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#double"/>
+#elseif( $field.isBlob() )
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#base64Binary"/>
+#elseif( $field.isClob() )
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+#end
+</owl:DatatypeProperty>
+#end
+#end
+#end
+#end
+#end
+</rdf:RDF>
Modified: trunk/equanda-generate/src/main/velocity/docs.ini
===================================================================
--- trunk/equanda-generate/src/main/velocity/docs.ini 2007-10-03 10:34:24 UTC (rev 104)
+++ trunk/equanda-generate/src/main/velocity/docs.ini 2007-10-05 09:35:51 UTC (rev 105)
@@ -6,6 +6,8 @@
template1=index.html.vm
output2=${outputDir}om.mm
template2=om.mm.vm
+output3=${outputDir}ontology.owl
+template3=ontology.owl.vm
[table]
output1=${outputDir}Table${table}.html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-03 10:34:28
|
Revision: 104
http://equanda.svn.sourceforge.net/equanda/?rev=104&view=rev
Author: triathlon98
Date: 2007-10-03 03:34:24 -0700 (Wed, 03 Oct 2007)
Log Message:
-----------
clean logs on error, allow firebird 2 server etc
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/equanda-test/test-test/pom.xml
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
trunk/pom.xml
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2007-10-02 23:19:57 UTC (rev 103)
+++ trunk/config/checkstyle.xml 2007-10-03 10:34:24 UTC (rev 104)
@@ -91,6 +91,7 @@
<module name="RedundantImport"/>
<module name="UnusedImports"/>
<module name="ImportOrder">
+ <property name="groups" value="be,org"/>
<property name="severity" value="info"/>
</module>
<!--<module name="ImportControl"/>-->
Modified: trunk/equanda-test/test-test/pom.xml
===================================================================
--- trunk/equanda-test/test-test/pom.xml 2007-10-02 23:19:57 UTC (rev 103)
+++ trunk/equanda-test/test-test/pom.xml 2007-10-03 10:34:24 UTC (rev 104)
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.firebirdsql</groupId>
<artifactId>jaybird</artifactId>
- <version>1.5.5</version>
+ <version>2.1.1</version>
</dependency>
</dependencies>
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-10-02 23:19:57 UTC (rev 103)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2007-10-03 10:34:24 UTC (rev 104)
@@ -24,14 +24,14 @@
package org.equanda.tool.ddltool;
-import org.apache.log4j.Logger;
-import org.equanda.util.StringUtil;
-
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.sql.*;
import java.util.*;
+import org.apache.log4j.Logger;
+import org.equanda.util.SaveException;
+import org.equanda.util.StringUtil;
/**
* Manages the Firebird database.
@@ -100,7 +100,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
return col;
@@ -120,7 +120,7 @@
query = "ALTER TABLE " + tableName + " ADD " + fieldName + " Char(14)";
executeQuery( query );
// could not find a way to build
- String fk = "FK_" + getShortTableName( tableName) +'_'+fieldName;
+ String fk = "FK_" + getShortTableName( tableName ) + '_' + fieldName;
if ( fk.length() > 27 ) fk = fk.substring( 0, 27 );
query = "ALTER TABLE " + tableName + " ADD CONSTRAINT " + fk +
" FOREIGN KEY (" + fieldName + ") REFERENCES " + linkTableName + " (EQUANDA_UOID)";
@@ -134,7 +134,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( query + " " + e );
+ SaveException.saveException( e, query );
log.error( e, e );
result = false;
}
@@ -153,7 +153,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
result = false;
}
@@ -170,6 +170,8 @@
{
StringBuffer camel = new StringBuffer();
+ if ( tableName.startsWith( "T_" ) ) tableName = tableName.substring( 2 );
+
for ( int i = 0; i < tableName.length() ; i++ )
{
if ( Character.isUpperCase( tableName.charAt( i ) ) )
@@ -227,7 +229,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
result = false;
}
@@ -245,7 +247,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
result = false;
}
@@ -265,7 +267,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
result = false;
}
@@ -286,7 +288,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
return col;
@@ -305,7 +307,7 @@
}
catch ( SQLException e )
{
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
return col;
@@ -341,7 +343,7 @@
}
catch ( SQLException e )
{
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
return true;
@@ -428,7 +430,7 @@
}
catch ( SQLException e )
{
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
res = false;
}
@@ -443,7 +445,7 @@
}
catch ( SQLException e )
{
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
return null;
}
@@ -462,7 +464,7 @@
}
catch ( SQLException e )
{
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
if ( !hasPK )
@@ -499,7 +501,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
}
@@ -509,7 +511,7 @@
try
{
String table = tableInfo[ 0 ];
- String upTable=table.toUpperCase();
+ String upTable = table.toUpperCase();
String field = tableInfo[ 1 ];
String fieldDef = tableInfo[ 2 ];
ResultSet rs = connection.getMetaData().getTables( null, null, upTable, null );
@@ -535,7 +537,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
}
@@ -587,7 +589,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
}
@@ -631,7 +633,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
}
@@ -642,7 +644,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
return;
}
@@ -708,7 +710,7 @@
catch ( SQLException e )
{
oops = e;
- System.err.println( e );
+ SaveException.saveException( e );
log.error( e, e );
}
log.info( "Field updated: " + field );
@@ -766,7 +768,15 @@
{
Statement st = connection.createStatement();
System.out.print( query );
- st.execute( query );
+ try
+ {
+ st.execute( query );
+ }
+ catch ( SQLException se )
+ {
+ System.out.println( "" ); // force output
+ throw se;
+ }
System.out.println( " OK" );
st.close();
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-10-02 23:19:57 UTC (rev 103)
+++ trunk/pom.xml 2007-10-03 10:34:24 UTC (rev 104)
@@ -133,6 +133,25 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>remove-logs</id>
+ <phase>clean</phase>
+ <configuration>
+ <tasks>
+ <delete file="errors.txt"/>
+ <delete file="velocity.log"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-02 23:19:58
|
Revision: 103
http://equanda.svn.sourceforge.net/equanda/?rev=103&view=rev
Author: triathlon98
Date: 2007-10-02 16:19:57 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
improve checkstyle configuration
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java
trunk/equanda-util/src/main/java/org/equanda/util/PrintfFormat.java
trunk/equanda-util/src/main/java/org/equanda/util/script/DateExtension.java
trunk/equanda-util/src/main/java/org/equanda/util/script/FileExtension.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/JSortedList.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/SwingUtil.java
trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java
trunk/equanda-util/src/main/java/org/equanda/util/xml/tree/ChildNode.java
trunk/equanda-util/src/main/java/org/equanda/util/xml/tree/NodeList.java
trunk/equanda-util/src/main/java/org/equanda/util/xml/tree/ParentNode.java
trunk/equanda-util/src/main/java/org/equanda/util/xml/tree/XMLDocumentBuilder.java
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2007-10-02 21:07:20 UTC (rev 102)
+++ trunk/config/checkstyle.xml 2007-10-02 23:19:57 UTC (rev 103)
@@ -12,11 +12,13 @@
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
- <module name="PackageHtml"/>
+ <!--<module name="PackageHtml"/>-->
<!-- Checks whether files end with a new line. -->
<!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile"/>
+ <module name="NewlineAtEndOfFile">
+ <property name="severity" value="info"/>
+ </module>
<!-- Checks that property files contain the same keys. -->
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
@@ -34,21 +36,23 @@
<!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
<module name="LeftCurly">
+ <property name="severity" value="info"/>
<property name="option" value="nl"/>
</module>
<module name="RightCurly">
+ <property name="severity" value="info"/>
<property name="option" value="alone"/>
</module>
<!--<module name="EmptyBlock"/>-->
<module name="AvoidNestedBlocks"/>
- <module name="NeedBraces"/>
+ <!--<module name="NeedBraces"/> no braces is allowed when on same line -->
<!-- Javadoc comments checks, see http://checkstyle.sourceforge.net/config_javadoc.html -->
<module name="JavadocMethod">
<property name="excludeScope" value="private"/>
</module>
- <module name="JavadocType"/>
+ <!--<module name="JavadocType"/>-->
<!--<module name="JavadocVariable"/>-->
<!--<module name="JavadocStyle"/>-->
@@ -65,7 +69,9 @@
<module name="MethodName"/>
<module name="PackageName"/>
<module name="ParameterName"/>
- <module name="StaticVariableName"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)$"/>
+ </module>
<module name="TypeName"/>
<!-- header, see http://checkstyle.sourceforge.net/config_header.html -->
@@ -84,17 +90,26 @@
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
- <module name="ImportOrder"/>
+ <module name="ImportOrder">
+ <property name="severity" value="info"/>
+ </module>
<!--<module name="ImportControl"/>-->
<!-- size violations, see http://checkstyle.sourceforge.net/config_sizes.html -->
<module name="LineLength">
+ <property name="severity" value="info"/>
<property name="max" value="120"/>
</module>
- <module name="FileLength"/>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/>
+ <module name="FileLength">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="MethodLength">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="severity" value="info"/>
+ </module>
<!-- whitespace, see http://checkstyle.sourceforge.net/config_whitespace.html -->
@@ -106,49 +121,58 @@
</module>
<module name="MethodParamPad"/>
<module name="NoWhitespaceAfter">
+ <property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_START -->
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
</module>
<module name="NoWhitespaceBefore">
+ <property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_START and GENERIC_END -->
- <property name="tokens" value="SEMI, POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
+ <property name="tokens" value="POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
</module>
- <module name="OperatorWrap"/>
+ <!--<module name="OperatorWrap"/>-->
<module name="ParenPad">
<property name="option" value="space"/>
</module>
<module name="TypecastParenPad"/>
<module name="TabCharacter"/>
<module name="WhitespaceAfter">
+ <property name="severity" value="info"/>
<!-- Default tokens and additional GENERIC_END -->
<property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
</module>
<module name="WhitespaceAround">
+ <property name="severity" value="info"/>
<!-- Default tokens without GENERIC_START and GENERIC_END -->
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
- </module>
- <module name="TabCharacter"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
+ <property name="tokens"
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
</module>
+ <module name="TabCharacter">
+ <property name="severity" value="info"/>
+ </module>
<!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
+ <!--<module name="ModifierOrder"/>-->
+ <module name="RedundantModifier">
+ <property name="severity" value="info"/>
+ </module>
<!-- coding , see http://checkstyle.sourceforge.net/config_coding.html -->
- <module name="ArrayTrailingComma"/>
+ <module name="ArrayTrailingComma">
+ <property name="severity" value="info"/>
+ </module>
<!--<module name="AvoidInlineConditionals"/>-->
<module name="CovariantEquals"/>
<module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
- <module name="FinalLocalVariable"/>
+ <!--<module name="FinalLocalVariable"/>-->
<module name="HiddenField">
+ <property name="severity" value="info"/>
<property name="ignoreConstructorParameter" value="true"/>
<property name="ignoreSetter" value="true"/>
</module>
@@ -159,11 +183,13 @@
<property name="tokens" value="LITERAL_NATIVE"/>
</module>
<module name="IllegalTokenText"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
+ <module name="InnerAssignment">
+ <property name="severity" value="warning"/>
+ </module>
+ <!--<module name="MagicNumber"/>-->
<module name="MissingSwitchDefault"/>
<module name="ModifiedControlVariable"/>
- <module name="RedundantThrows"/>
+ <!--<module name="RedundantThrows"/>-->
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="StringLiteralEquality"/>
@@ -175,15 +201,17 @@
<!--<module name="IllegalThrows"/>-->
<module name="PackageDeclaration"/>
<module name="JUnitTestCase"/>
- <module name="ReturnCount"/>
- <module name="IllegalType"/>
- <module name="DeclarationOrder"/>
+ <!--<module name="ReturnCount"/>-->
+ <!--<module name="IllegalType"/>-->
+ <!--<module name="DeclarationOrder"/>-->
<module name="ParameterAssignment"/>
- <module name="ExplicitInitialization"/>
+ <module name="ExplicitInitialization">
+ <property name="severity" value="info"/>
+ </module>
<module name="DefaultComesLast"/>
<!--<module name="MissingCtor"/>-->
<module name="FallThrough"/>
- <module name="MultipleStringLiterals"/>
+ <!--<module name="MultipleStringLiterals"/>-->
<!--<module name="MultipleVariableDeclarations"/>-->
<!--<module name="RequireThis"/>-->
<!--<module name="UnnecessaryParentheses"/>-->
@@ -191,6 +219,7 @@
<!-- class design, see http://checkstyle.sourceforge.net/config_design.html -->
<module name="VisibilityModifier">
+ <property name="severity" value="info"/>
<property name="protectedAllowed" value="true"/>
</module>
<module name="FinalClass"/>
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-10-02 21:07:20 UTC (rev 102)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaSimpleInput/EquandaSimpleInput.java 2007-10-02 23:19:57 UTC (rev 103)
@@ -112,7 +112,7 @@
@Parameter( name = "selectionModel" )
public abstract EquandaSelectionModel getSelectionModel();
- @Parameter( name = "dateFormat" )
+ @Parameter( name = "DATE_FORMAT" )
public abstract String getDateFormat();
@Parameter( name = "suggestValue" )
Modified: trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java
===================================================================
--- trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java 2007-10-02 21:07:20 UTC (rev 102)
+++ trunk/equanda-tapestry4/src/main/java/org/equanda/tapestry/components/input/equandaTimestamp/EquandaTimestamp.java 2007-10-02 23:19:57 UTC (rev 103)
@@ -99,10 +99,10 @@
@Parameter( name = "timeSize", defaultValue = "12" )
public abstract int getTimeSize();
- @Parameter( name = "dateFormat", defaultValue = "literal:dd.MM.yyyy" )
+ @Parameter( name = "DATE_FORMAT", defaultValue = "literal:dd.MM.yyyy" )
public abstract String getDateFormat();
- @Parameter( name = "timeFormat", defaultValue = "literal:HH:mm:ss.SSS" )
+ @Parameter( name = "TIME_FORMAT", defaultValue = "literal:HH:mm:ss.SSS" )
public abstract String getTimeFormat();
@Parameter( name = "validatorList" )
Modified: trunk/equanda-util/src/main/java/org/equanda/util/PrintfFormat.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/PrintfFormat.java 2007-10-02 21:07:20 UTC (rev 102)
+++ trunk/equanda-util/src/main/java/org/equanda/util/PrintfFormat.java 2007-10-02 23:19:57 UTC (rev 103)
@@ -1,6 +1,26 @@
/**
* This file is part of the equanda project.
*
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
// (c) 2000 Sun Microsystems, Inc.
// ALL RIGHTS RESERVED
//
@@ -26,7 +46,6 @@
// http://java.sun.com/nav/business/index.html for further important licensing
// information for the Java Technology.
//
- */
package org.equanda.util;
@@ -42,7 +61,7 @@
* objects embedded within a string. Primitive types
* must be passed using wrapper types. The formatting
* is controlled by a control string.
- * <p>
+ * <p/>
* A control string is a Java string that contains a
* control specification. The control specification
* starts at the first percent sign (%) in the string,
@@ -61,7 +80,7 @@
* </pre>
* There are variants of this basic form that are
* discussed below.</p>
- * <p>
+ * <p/>
* The format is composed of zero or more directives
* defined as follows:
* <ul>
@@ -72,7 +91,7 @@
* <li>conversion specifications, each of which
* results in the fetching of zero or more arguments.
* </ul></p>
- * <p>
+ * <p/>
* The results are undefined if there are insufficient
* arguments for the format. Usually an unchecked
* exception will be thrown. If the format is
@@ -81,7 +100,7 @@
* In format strings containing the % form of
* conversion specifications, each argument in the
* argument list is used exactly once.</p>
- * <p>
+ * <p/>
* Conversions can be applied to the <code>n</code>th
* argument after the format in the argument list,
* rather than to the next unused argument. In this
@@ -89,13 +108,13 @@
* sequence %<code>n</code>$, where <code>n</code> is
* a decimal integer giving the position of the
* argument in the argument list.</p>
- * <p>
+ * <p/>
* In format strings containing the %<code>n</code>$
* form of conversion specifications, each argument
* in the argument list is used exactly once.</p>
- *
+ * <p/>
* <h4>Escape Sequences</h4>
- * <p>
+ * <p/>
* The following table lists escape sequences and
* associated actions on display devices capable of
* the action.
@@ -138,14 +157,14 @@
* </td></tr>
* </table></p>
* <h4>Conversion Specifications</h4>
- * <p>
+ * <p/>
* Each conversion specification is introduced by
* the percent sign character (%). After the character
* %, the following appear in sequence:</p>
- * <p>
+ * <p/>
* Zero or more flags (in any order), which modify the
* meaning of the conversion specification.</p>
- * <p>
+ * <p/>
* An optional minimum field width. If the converted
* value has fewer characters than the field width, it
* will be padded with spaces by default on the left;
@@ -155,7 +174,7 @@
* of a decimal integer. If the conversion character
* is s, the field width is the the minimum number of
* characters to be printed.</p>
- * <p>
+ * <p/>
* An optional precision that gives the minumum number
* of digits to appear for the d, i, o, x or X
* conversions (the field is padded with leading
@@ -170,17 +189,17 @@
* with a c conversion character the precision is
* ignored.
* </p>
- * <p>
+ * <p/>
* An optional h specifies that a following d, i, o,
* x, or X conversion character applies to a type
* short argument (the argument will be promoted
* according to the integral promotions and its value
* converted to type short before printing).</p>
- * <p>
+ * <p/>
* An optional l (ell) specifies that a following
* d, i, o, x, or X conversion character applies to a
* type long argument.</p>
- * <p>
+ * <p/>
* A field width or precision may be indicated by an
* asterisk (*) instead of a digit string. In this
* case, an integer argument supplised the field width
@@ -192,7 +211,7 @@
* negative, it will be changed to zero. A negative
* field width argument is taken as a - flag, followed
* by a positive field width.</p>
- * <p>
+ * <p/>
* In format strings containing the %<code>n</code>$
* form of a conversion specification, a field width
* or precision may be indicated by the sequence
@@ -200,7 +219,7 @@
* giving the position in the argument list (after the
* format argument) of an integer argument containing
* the field width or precision.</p>
- * <p>
+ * <p/>
* The format can contain either numbered argument
* specifications (that is, %<code>n</code>$ and
* *<code>m</code>$), or unnumbered argument
@@ -209,9 +228,9 @@
* be mixed with the %<code>n</code>$ form. The
* results of mixing numbered and unnumbered argument
* specifications in a format string are undefined.</p>
- *
+ * <p/>
* <h4>Flag Characters</h4>
- * <p>
+ * <p/>
* The flags and their meanings are:</p>
* <dl>
* <dt>'<dd> integer portion of the result of a
@@ -257,17 +276,17 @@
* 0 flag will be ignored. For c conversions,
* the flag is ignored.
* </dl>
- *
+ * <p/>
* <h4>Conversion Characters</h4>
- * <p>
+ * <p/>
* Each conversion character results in fetching zero
* or more arguments. The results are undefined if
* there are insufficient arguments for the format.
* Usually, an unchecked exception will be thrown.
* If the format is exhausted while arguments remain,
* the excess arguments are ignored.</p>
- *
- * <p>
+ * <p/>
+ * <p/>
* The conversion characters and their meanings are:
* </p>
* <dl>
@@ -352,7 +371,7 @@
* followed by a digit.
* <dt>c,C<dd>The integer argument is converted to a
* char and the result is written.
- *
+ * <p/>
* <dt>s,S<dd>The argument is taken to be a string and
* bytes from the string are written until the
* end of the string or the number of bytes
@@ -364,44 +383,44 @@
* <dt>%<dd>Write a % character; no argument is
* converted.
* </dl>
- * <p>
+ * <p/>
* If a conversion specification does not match one of
* the above forms, an IllegalArgumentException is
* thrown and the instance of PrintfFormat is not
* created.</p>
- * <p>
+ * <p/>
* If a floating point value is the internal
* representation for infinity, the output is
* [+]Infinity, where Infinity is either Infinity or
* Inf, depending on the desired output string length.
* Printing of the sign follows the rules described
* above.</p>
- * <p>
+ * <p/>
* If a floating point value is the internal
* representation for "not-a-number," the output is
* [+]NaN. Printing of the sign follows the rules
* described above.</p>
- * <p>
+ * <p/>
* In no case does a non-existent or small field width
* cause truncation of a field; if the result of a
* conversion is wider than the field width, the field
* is simply expanded to contain the conversion result.
* </p>
- * <p>
+ * <p/>
* The behavior is like printf. One exception is that
* the minimum number of exponent digits is 3 instead
* of 2 for e and E formats when the optional L is used
* before the e, E, g, or G conversion character. The
* optional L does not imply conversion to a long long
* double. </p>
- * <p>
+ * <p/>
* The biggest divergence from the C printf
* specification is in the use of 16 bit characters.
* This allows the handling of characters beyond the
* small ASCII character set and allows the utility to
* interoperate correctly with the rest of the Java
* runtime environment.</p>
- * <p>
+ * <p/>
* Omissions from the C printf specification are
* numerous. All the known omissions are present
* because Java never uses bytes to represent
@@ -428,7 +447,7 @@
* <li>All other reference types can be formatted
* using the s or S conversion characters only.
* </ul>
- * <p>
+ * <p/>
* Most of this specification is quoted from the Unix
* man page for the sprintf utility.</p>
*
@@ -446,9 +465,7 @@
* the format.
*
* @param fmtArg Control string.
- * @throws IllegalArgumentException if the control
- * string is null, zero length, or otherwise
- * malformed.
+ * @throws IllegalArgumentException if the control string is null, zero length, or otherwise malformed.
*/
public PrintfFormat( String fmtArg )
throws IllegalArgumentException
@@ -464,24 +481,23 @@
* percent signs designates a single percent sign in
* the format.
*
+ * @param locale locale
* @param fmtArg Control string.
- * @throws IllegalArgumentException if the control
- * string is null, zero length, or otherwise
- * malformed.
+ * @throws IllegalArgumentException if the control string is null, zero length, or otherwise malformed.
*/
public PrintfFormat( Locale locale, String fmtArg )
throws IllegalArgumentException
{
- if ( locale==null)
+ if ( locale == null )
{
- dfs=new DecimalFormatSymbols( Locale.US);
+ dfs = new DecimalFormatSymbols( Locale.US );
}
else
{
dfs = new DecimalFormatSymbols( locale );
}
- int ePos = 0;
- ConversionSpecification sFmt = null;
+ int ePos;
+ ConversionSpecification sFmt;
String unCS = this.nonControl( fmtArg, 0 );
if ( unCS != null )
{
@@ -491,8 +507,7 @@
}
while ( cPos != -1 && cPos < fmtArg.length() )
{
- for ( ePos = cPos + 1 ; ePos < fmtArg.length() ;
- ePos++ )
+ for ( ePos = cPos + 1; ePos < fmtArg.length() ; ePos++ )
{
char c = 0;
c = fmtArg.charAt( ePos );
@@ -534,8 +549,7 @@
* @param start Position in the string
* <code>s</code> to begin looking for the start
* of a control string.
- * @return the substring from the start position
- * to the beginning of the control string.
+ * @return the substring from the start position to the beginning of the control string.
*/
private String nonControl( String s, int start )
{
@@ -580,24 +594,24 @@
if ( cs.isPositionalFieldWidth() )
{
int ifw = cs.getArgumentPositionForFieldWidth() - 1;
- cs.setFieldWidthWithArg( ( (Integer) o[ ifw ] ).intValue() );
+ cs.setFieldWidthWithArg( ( (Integer) o[ ifw ] ) );
}
if ( cs.isPositionalPrecision() )
{
int ipr = cs.getArgumentPositionForPrecision() - 1;
- cs.setPrecisionWithArg( ( (Integer) o[ ipr ] ).intValue() );
+ cs.setPrecisionWithArg( ( (Integer) o[ ipr ] ) );
}
}
else
{
if ( cs.isVariableFieldWidth() )
{
- cs.setFieldWidthWithArg( ( (Integer) o[ i ] ).intValue() );
+ cs.setFieldWidthWithArg( ( (Integer) o[ i ] ) );
i++;
}
if ( cs.isVariablePrecision() )
{
- cs.setPrecisionWithArg( ( (Integer) o[ i ] ).intValue() );
+ cs.setPrecisionWithArg( ( (Integer) o[ i ] ) );
i++;
}
}
@@ -890,13 +904,13 @@
}
/**
- * <p>
+ * <p/>
* ConversionSpecification allows the formatting of
* a single primitive or object embedded within a
* string. The formatting is controlled by a
* format string. Only one Java primitive or
* object can be formatted at a time.
- * <p>
+ * <p/>
* A format string is a Java string that contains
* a control string. The control string starts at
* the first percent sign (%) in the string,
@@ -908,12 +922,12 @@
* <li>precedes a sequence of characters that parses
* as a valid control string.
* </ol>
- * <p>
+ * <p/>
* A control string takes the form:
* <pre> % ['-+ #0]* [0..9]* { . [0..9]* }+
* { [hlL] }+ [idfgGoxXeEcs]
* </pre>
- * <p>
+ * <p/>
* The behavior is like printf. One (hopefully the
* only) exception is that the minimum number of
* exponent digits is 3 instead of 2 for e and E
@@ -928,7 +942,8 @@
* Constructor. Used to prepare an instance
* to hold a literal, not a control string.
*/
- ConversionSpecification() { }
+ ConversionSpecification()
+ { }
/**
* Constructor for a conversion specification.
@@ -1138,13 +1153,12 @@
*
* @param s the int to format.
* @return the formatted String.
- * @throws IllegalArgumentException if the
- * conversion character is f, e, E, g, or G.
+ * @throws IllegalArgumentException if the conversion character is f, e, E, g, or G.
*/
String internalsprintf( int s )
throws IllegalArgumentException
{
- String s2 = "";
+ String s2;
switch ( conversionCharacter )
{
case 'd':
@@ -1208,13 +1222,12 @@
*
* @param s the long to format.
* @return the formatted String.
- * @throws IllegalArgumentException if the
- * conversion character is f, e, E, g, or G.
+ * @throws IllegalArgumentException if the conversion character is f, e, E, g, or G.
*/
String internalsprintf( long s )
throws IllegalArgumentException
{
- String s2 = "";
+ String s2;
switch ( conversionCharacter )
{
case 'd':
@@ -1267,7 +1280,8 @@
break;
default:
throw new IllegalArgumentException(
- "Cannot format a long with a format using a " + conversionCharacter + " conversion character." );
+ "Cannot format a long with a format using a " + conversionCharacter +
+ " conversion character." );
}
return s2;
}
@@ -1372,12 +1386,12 @@
* is ignored. The '0' flag character implies that
* padding to the field width will be done with
* zeros instead of blanks.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the number of digits
* to appear after the radix character. Padding is
* with trailing 0s.
@@ -1443,7 +1457,7 @@
expon = 0;
if ( sx.charAt( ie ) == '-' )
{
- for ( ++ie ; ie < sx.length() ; ie++ )
+ for ( ++ie; ie < sx.length() ; ie++ )
{
if ( sx.charAt( ie ) != '0' ) break;
}
@@ -1475,25 +1489,25 @@
p = defaultDigits - 1;
}
char[] ca1 = sx.toCharArray();
- char[] ca2 = new char[ n1In + n2In ];
+ char[] ca2 = new char[n1In + n2In];
char[] ca3, ca4, ca5;
- for ( j = 0 ; j < n1In ; j++ )
+ for ( j = 0; j < n1In ; j++ )
{
ca2[ j ] = ca1[ j ];
}
i = j + 1;
- for ( k = 0 ; k < n2In ; j++, i++, k++ )
+ for ( k = 0; k < n2In ; j++, i++, k++ )
{
ca2[ j ] = ca1[ i ];
}
if ( n1In + expon <= 0 )
{
- ca3 = new char[ -expon + n2In ];
- for ( j = 0, k = 0 ; k < ( -n1In - expon ) ; k++, j++ )
+ ca3 = new char[-expon + n2In];
+ for ( j = 0, k = 0; k < ( -n1In - expon ) ; k++, j++ )
{
ca3[ j ] = '0';
}
- for ( i = 0 ; i < ( n1In + n2In ) ; i++, j++ )
+ for ( i = 0; i < ( n1In + n2In ) ; i++, j++ )
{
ca3[ j ] = ca2[ i ];
}
@@ -1521,7 +1535,7 @@
}
if ( n1In + expon <= 0 )
{
- ca4 = new char[ 2 + p ];
+ ca4 = new char[2 + p];
if ( !carry )
{
ca4[ 0 ] = '0';
@@ -1533,7 +1547,7 @@
if ( alternateForm || !precisionSet || precision != 0 )
{
ca4[ 1 ] = '.';
- for ( i = 0, j = 2 ; i < Math.min( p, ca3.length ) ; i++, j++ )
+ for ( i = 0, j = 2; i < Math.min( p, ca3.length ) ; i++, j++ )
{
ca4[ j ] = ca3[ i ];
}
@@ -1547,11 +1561,11 @@
if ( alternateForm || !precisionSet
|| precision != 0 )
{
- ca4 = new char[ n1In + expon + p + 1 ];
+ ca4 = new char[n1In + expon + p + 1];
}
else
{
- ca4 = new char[ n1In + expon ];
+ ca4 = new char[n1In + expon];
}
j = 0;
}
@@ -1560,16 +1574,16 @@
if ( alternateForm || !precisionSet
|| precision != 0 )
{
- ca4 = new char[ n1In + expon + p + 2 ];
+ ca4 = new char[n1In + expon + p + 2];
}
else
{
- ca4 = new char[ n1In + expon + 1 ];
+ ca4 = new char[n1In + expon + 1];
}
ca4[ 0 ] = '1';
j = 1;
}
- for ( i = 0 ; i < Math.min( n1In + expon, ca3.length ) ; i++, j++ )
+ for ( i = 0; i < Math.min( n1In + expon, ca3.length ) ; i++, j++ )
{
ca4[ j ] = ca3[ i ];
}
@@ -1581,7 +1595,7 @@
{
ca4[ j ] = '.';
j++;
- for ( k = 0 ; i < ca3.length && k < p ; i++, j++, k++ )
+ for ( k = 0; i < ca3.length && k < p ; i++, j++, k++ )
{
ca4[ j ] = ca3[ i ];
}
@@ -1620,12 +1634,12 @@
j = 0;
if ( ( !minusSign && ( leadingSign || leadingSpace ) ) || minusSign )
{
- ca5 = new char[ ca4.length + nZeros + 1 ];
+ ca5 = new char[ca4.length + nZeros + 1];
j++;
}
else
{
- ca5 = new char[ ca4.length + nZeros ];
+ ca5 = new char[ca4.length + nZeros];
}
if ( !minusSign )
{
@@ -1636,11 +1650,11 @@
{
ca5[ 0 ] = '-';
}
- for ( i = 0 ; i < nZeros ; i++, j++ )
+ for ( i = 0; i < nZeros ; i++, j++ )
{
ca5[ j ] = '0';
}
- for ( i = 0 ; i < ca4.length ; i++, j++ ) ca5[ j ] = ca4[ i ];
+ for ( i = 0; i < ca4.length ; i++, j++ ) ca5[ j ] = ca4[ i ];
int lead = 0;
if ( ca5[ 0 ] == '+' || ca5[ 0 ] == '-' || ca5[ 0 ] == ' ' )
@@ -1661,9 +1675,9 @@
char[] ca6 = ca5;
if ( thousands && nThousands > 0 )
{
- ca6 = new char[ ca5.length + nThousands + lead ];
+ ca6 = new char[ca5.length + nThousands + lead];
ca6[ 0 ] = ca5[ 0 ];
- for ( i = lead, k = lead ; i < dp ; i++ )
+ for ( i = lead, k = lead; i < dp ; i++ )
{
if ( i > 0 && ( dp - i ) % 3 == 0 )
{
@@ -1759,16 +1773,16 @@
* ignored. The '0' flag character implies that
* padding to the field width will be done with
* zeros instead of blanks.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear after the radix character.
* Padding is with trailing 0s.
- *
+ * <p/>
* The behavior is like printf. One (hopefully the
* only) exception is that the minimum number of
* exponent digits is 3 instead of 2 for e and E
@@ -1841,7 +1855,7 @@
expon = 0;
if ( sx.charAt( ie ) == '-' )
{
- for ( ++ie ; ie < sx.length() ; ie++ )
+ for ( ++ie; ie < sx.length() ; ie++ )
{
if ( sx.charAt( ie ) != '0' ) break;
}
@@ -1898,7 +1912,7 @@
}
else
{
- for ( i0 = 0 ; i0 < ca1.length ; i0++ )
+ for ( i0 = 0; i0 < ca1.length ; i0++ )
{
if ( ca1[ i0 ] != '0' ) break;
}
@@ -1912,10 +1926,10 @@
}
if ( carry )
{
- ca2 = new char[ i0 + p + 1 ];
+ ca2 = new char[i0 + p + 1];
ca2[ i0 ] = '1';
- for ( j = 0 ; j < i0 ; j++ ) ca2[ j ] = '0';
- for ( i = i0, j = i0 + 1 ; j < p + 1 ; i++, j++ )
+ for ( j = 0; j < i0 ; j++ ) ca2[ j ] = '0';
+ for ( i = i0, j = i0 + 1; j < p + 1 ; i++, j++ )
{
ca2[ j ] = ca1[ i ];
}
@@ -1933,11 +1947,11 @@
}
if ( alternateForm || !precisionSet || precision != 0 )
{
- ca2 = new char[ 2 + p + eSize ];
+ ca2 = new char[2 + p + eSize];
}
else
{
- ca2 = new char[ 1 + eSize ];
+ ca2 = new char[1 + eSize];
}
if ( ca1[ 0 ] != '0' )
{
@@ -1946,7 +1960,7 @@
}
else
{
- for ( j = 1 ; j < ( ePos == -1 ? ca1.length : ePos ) ; j++ )
+ for ( j = 1; j < ( ePos == -1 ? ca1.length : ePos ) ; j++ )
{
if ( ca1[ j ] != '0' ) break;
}
@@ -1972,7 +1986,7 @@
{
i = 1;
}
- for ( k = 0 ; k < p && j < ca1.length ; j++, i++, k++ )
+ for ( k = 0; k < p && j < ca1.length ; j++, i++, k++ )
{
ca2[ i ] = ca1[ j ];
}
@@ -2123,12 +2137,12 @@
j = 0;
if ( ( !minusSign && ( leadingSign || leadingSpace ) ) || minusSign )
{
- ca3 = new char[ ca2.length + nZeros + 1 ];
+ ca3 = new char[ca2.length + nZeros + 1];
j++;
}
else
{
- ca3 = new char[ ca2.length + nZeros ];
+ ca3 = new char[ca2.length + nZeros];
}
if ( !minusSign )
{
@@ -2139,11 +2153,11 @@
{
ca3[ 0 ] = '-';
}
- for ( k = 0 ; k < nZeros ; j++, k++ )
+ for ( k = 0; k < nZeros ; j++, k++ )
{
ca3[ j ] = '0';
}
- for ( i = 0 ; i < ca2.length && j < ca3.length ; i++, j++ )
+ for ( i = 0; i < ca2.length && j < ca3.length ; i++, j++ )
{
ca3[ j ] = ca2[ i ];
}
@@ -2167,9 +2181,9 @@
char[] ca4 = ca3;
if ( thousands && nThousands > 0 )
{
- ca4 = new char[ ca3.length + nThousands + lead ];
+ ca4 = new char[ca3.length + nThousands + lead];
ca4[ 0 ] = ca3[ 0 ];
- for ( i = lead, k = lead ; i < dp ; i++ )
+ for ( i = lead, k = lead; i < dp ; i++ )
{
if ( i > 0 && ( dp - i ) % 3 == 0 )
{
@@ -2249,7 +2263,7 @@
private boolean startSymbolicCarry( char[] ca, int cLast, int cFirst )
{
boolean carry = true;
- for ( int i = cLast ; carry && i >= cFirst ; i-- )
+ for ( int i = cLast; carry && i >= cFirst ; i-- )
{
carry = false;
switch ( ca[ i ] )
@@ -2372,12 +2386,12 @@
nBlanks = fieldWidth - ca4.length;
if ( nBlanks > 0 )
{
- ca5 = new char[ ca4.length + nBlanks ];
- for ( i = 0 ; i < ca4.length ; i++ )
+ ca5 = new char[ca4.length + nBlanks];
+ for ( i = 0; i < ca4.length ; i++ )
{
ca5[ i ] = ca4[ i ];
}
- for ( j = 0 ; j < nBlanks ; j++, i++ )
+ for ( j = 0; j < nBlanks ; j++, i++ )
{
ca5[ i ] = ' ';
}
@@ -2388,12 +2402,12 @@
nBlanks = fieldWidth - ca4.length;
if ( nBlanks > 0 )
{
- ca5 = new char[ ca4.length + nBlanks ];
- for ( i = 0 ; i < nBlanks ; i++ )
+ ca5 = new char[ca4.length + nBlanks];
+ for ( i = 0; i < nBlanks ; i++ )
{
ca5[ i ] = ' ';
}
- for ( j = 0 ; j < ca4.length ; i++, j++ )
+ for ( j = 0; j < ca4.length ; i++, j++ )
{
ca5[ i ] = ca4[ j ];
}
@@ -2404,7 +2418,7 @@
nBlanks = fieldWidth - ca4.length;
if ( nBlanks > 0 )
{
- ca5 = new char[ ca4.length + nBlanks ];
+ ca5 = new char[ca4.length + nBlanks];
i = 0;
j = 0;
if ( ca4[ 0 ] == '-' )
@@ -2413,7 +2427,7 @@
i++;
j++;
}
- for ( int k = 0 ; k < nBlanks ; i++, k++ )
+ for ( int k = 0; k < nBlanks ; i++, k++ )
{
ca5[ i ] = '0';
}
@@ -2459,7 +2473,7 @@
/**
* Format method for the g conversion character.
- *
+ * <p/>
* For g format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
@@ -2471,12 +2485,12 @@
* ignored. The '0' flag character implies that
* padding to the field width will be done with
* zeros instead of blanks.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear after the radix character.
* Padding is with trailing 0s.
@@ -2549,7 +2563,7 @@
int expon = 0;
if ( sx.charAt( i ) == '-' )
{
- for ( ++i ; i < sx.length() ; i++ )
+ for ( ++i; i < sx.length() ; i++ )
{
if ( sx.charAt( i ) != '0' ) break;
}
@@ -2635,7 +2649,7 @@
/**
* Format method for the d conversion specifer and
* short argument.
- *
+ * <p/>
* For d format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
@@ -2647,12 +2661,12 @@
* ignored. The '0' flag character implies that
* padding to the field width will be done with
* zeros instead of blanks.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -2667,7 +2681,7 @@
/**
* Format method for the d conversion character and
* long argument.
- *
+ * <p/>
* For d format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
@@ -2679,12 +2693,12 @@
* ignored. The '0' flag character implies that
* padding to the field width will be done with
* zeros instead of blanks.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -2699,7 +2713,7 @@
/**
* Format method for the d conversion character and
* int argument.
- *
+ * <p/>
* For d format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
@@ -2711,12 +2725,12 @@
* ignored. The '0' flag character implies that
* padding to the field width will be done with
* zeros instead of blanks.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -2779,7 +2793,7 @@
n += nBlanks;
n += nLeadingZeros;
n += sx.length();
- char[] ca = new char[ n ];
+ char[] ca = new char[n];
if ( leftJustify )
{
if ( neg )
@@ -2793,15 +2807,15 @@
else if ( leadingSpace ) ca[ i++ ] = ' ';
char[] csx = sx.toCharArray();
jFirst = neg ? 1 : 0;
- for ( int j = 0 ; j < nLeadingZeros ; i++, j++ )
+ for ( int j = 0; j < nLeadingZeros ; i++, j++ )
{
ca[ i ] = '0';
}
- for ( int j = jFirst ; j < csx.length ; j++, i++ )
+ for ( int j = jFirst; j < csx.length ; j++, i++ )
{
ca[ i ] = csx[ j ];
}
- for ( int j = 0 ; j < nBlanks ; i++, j++ )
+ for ( int j = 0; j < nBlanks ; i++, j++ )
{
ca[ i ] = ' ';
}
@@ -2810,7 +2824,7 @@
{
if ( !leadingZeros )
{
- for ( i = 0 ; i < nBlanks ; i++ )
+ for ( i = 0; i < nBlanks ; i++ )
{
ca[ i ] = ' ';
}
@@ -2835,18 +2849,18 @@
ca[ i++ ] = '+';
}
else if ( leadingSpace ) ca[ i++ ] = ' ';
- for ( int j = 0 ; j < nBlanks ; j++, i++ )
+ for ( int j = 0; j < nBlanks ; j++, i++ )
{
ca[ i ] = '0';
}
}
- for ( int j = 0 ; j < nLeadingZeros ; j++, i++ )
+ for ( int j = 0; j < nLeadingZeros ; j++, i++ )
{
ca[ i ] = '0';
}
char[] csx = sx.toCharArray();
jFirst = neg ? 1 : 0;
- for ( int j = jFirst ; j < csx.length ; j++, i++ )
+ for ( int j = jFirst; j < csx.length ; j++, i++ )
{
ca[ i ] = csx[ j ];
}
@@ -2857,18 +2871,18 @@
/**
* Format method for the x conversion character and
* short argument.
- *
+ * <p/>
* For x format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
* left. The '#' flag character means to lead with
* '0x'.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -2946,18 +2960,18 @@
/**
* Format method for the x conversion character and
* long argument.
- *
+ * <p/>
* For x format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
* left. The '#' flag character means to lead with
* '0x'.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -3059,18 +3073,18 @@
/**
* Format method for the x conversion character and
* int argument.
- *
+ * <p/>
* For x format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
* left. The '#' flag character means to lead with
* '0x'.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -3178,7 +3192,7 @@
n += nLeadingZeros;
n += sx.length();
n += nBlanks;
- char[] ca = new char[ n ];
+ char[] ca = new char[n];
int i = 0;
if ( leftJustify )
{
@@ -3187,16 +3201,16 @@
ca[ i++ ] = '0';
ca[ i++ ] = 'x';
}
- for ( int j = 0 ; j < nLeadingZeros ; j++, i++ )
+ for ( int j = 0; j < nLeadingZeros ; j++, i++ )
{
ca[ i ] = '0';
}
char[] csx = sx.toCharArray();
- for ( int j = 0 ; j < csx.length ; j++, i++ )
+ for ( int j = 0; j < csx.length ; j++, i++ )
{
ca[ i ] = csx[ j ];
}
- for ( int j = 0 ; j < nBlanks ; j++, i++ )
+ for ( int j = 0; j < nBlanks ; j++, i++ )
{
ca[ i ] = ' ';
}
@@ -3205,7 +3219,7 @@
{
if ( !leadingZeros )
{
- for ( int j = 0 ; j < nBlanks ; j++, i++ )
+ for ( int j = 0; j < nBlanks ; j++, i++ )
{
ca[ i ] = ' ';
}
@@ -3217,17 +3231,17 @@
}
if ( leadingZeros )
{
- for ( int j = 0 ; j < nBlanks ; j++, i++ )
+ for ( int j = 0; j < nBlanks ; j++, i++ )
{
ca[ i ] = '0';
}
}
- for ( int j = 0 ; j < nLeadingZeros ; j++, i++ )
+ for ( int j = 0; j < nLeadingZeros ; j++, i++ )
{
ca[ i ] = '0';
}
char[] csx = sx.toCharArray();
- for ( int j = 0 ; j < csx.length ; j++, i++ )
+ for ( int j = 0; j < csx.length ; j++, i++ )
{
ca[ i ] = csx[ j ];
}
@@ -3243,19 +3257,19 @@
/**
* Format method for the o conversion character and
* short argument.
- *
+ * <p/>
* For o format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
* left. The '#' flag character means that the
* output begins with a leading 0 and the precision
* is increased by 1.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -3301,19 +3315,19 @@
/**
* Format method for the o conversion character and
* long argument.
- *
+ * <p/>
* For o format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
* left. The '#' flag character means that the
* output begins with a leading 0 and the precision
* is increased by 1.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -3407,19 +3421,19 @@
/**
* Format method for the o conversion character and
* int argument.
- *
+ * <p/>
* For o format, the flag character '-', means that
* the output should be left justified within the
* field. The default is to pad with blanks on the
* left. The '#' flag character means that the
* output begins with a leading 0 and the precision
* is increased by 1.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is to
* add no padding. Padding is with blanks by
* default.
- *
+ * <p/>
* The precision, if set, is the minimum number of
* digits to appear. Padding is with leading 0s.
*
@@ -3509,34 +3523,34 @@
}
if ( nBlanks < 0 ) nBlanks = 0;
int n = nLeadingZeros + sx.length() + nBlanks;
- char[] ca = new char[ n ];
+ char[] ca = new char[n];
int i;
if ( leftJustify )
{
- for ( i = 0 ; i < nLeadingZeros ; i++ ) ca[ i ] = '0';
+ for ( i = 0; i < nLeadingZeros ; i++ ) ca[ i ] = '0';
char[] csx = sx.toCharArray();
- for ( int j = 0 ; j < csx.length ; j++, i++ )
+ for ( int j = 0; j < csx.length ; j++, i++ )
{
ca[ i ] = csx[ j ];
}
- for ( int j = 0 ; j < nBlanks ; j++, i++ ) ca[ i ] = ' ';
+ for ( int j = 0; j < nBlanks ; j++, i++ ) ca[ i ] = ' ';
}
else
{
if ( leadingZeros )
{
- for ( i = 0 ; i < nBlanks ; i++ ) ca[ i ] = '0';
+ for ( i = 0; i < nBlanks ; i++ ) ca[ i ] = '0';
}
else
{
- for ( i = 0 ; i < nBlanks ; i++ ) ca[ i ] = ' ';
+ for ( i = 0; i < nBlanks ; i++ ) ca[ i ] = ' ';
}
- for ( int j = 0 ; j < nLeadingZeros ; j++, i++ )
+ for ( int j = 0; j < nLeadingZeros ; j++, i++ )
{
ca[ i ] = '0';
}
char[] csx = sx.toCharArray();
- for ( int j = 0 ; j < csx.length ; j++, i++ )
+ for ( int j = 0; j < csx.length ; j++, i++ )
{
ca[ i ] = csx[ j ];
}
@@ -3547,16 +3561,16 @@
/**
* Format method for the c conversion character and
* char argument.
- *
+ * <p/>
* The only flag character that affects c format is
* the '-', meaning that the output should be left
* justified within the field. The default is to
* pad with blanks on the left.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. Padding is with
* blanks by default. The default width is 1.
- *
+ * <p/>
* The precision, if set, is ignored.
*
* @param x the char to format.
@@ -3567,7 +3581,7 @@
int nPrint = 1;
int width = fieldWidth;
if ( !fieldWidthSet ) width = nPrint;
- char[] ca = new char[ width ];
+ char[] ca = new char[width];
int i = 0;
if ( leftJustify )
{
@@ -3585,18 +3599,18 @@
/**
* Format method for the s conversion character and
* String argument.
- *
+ * <p/>
* The only flag character that affects s format is
* the '-', meaning that the output should be left
* justified within the field. The default is to
* pad with blanks on the left.
- *
+ * <p/>
* The field width is treated as the minimum number
* of characters to be printed. The default is the
* smaller of the number of characters in the the
* input and the precision. Padding is with blanks
* by default.
- *
+ * <p/>
* The precision, if set, specifies the maximum
* number of characters to be printed from the
* string. A null digit string is treated
@@ -3625,33 +3639,33 @@
{
n += nPrint;
}
- char[] ca = new char[ n ];
+ char[] ca = new char[n];
int i = 0;
if ( leftJustify )
{
if ( nPrint >= x.length() )
{
char[] csx = x.toCharArray();
- for ( i = 0 ; i < x.length() ; i++ ) ca[ i ] = csx[ i ];
+ for ( i = 0; i < x.length() ; i++ ) ca[ i ] = csx[ i ];
}
else
{
char[] csx =
x.substring( 0, nPrint ).toCharArray();
- for ( i = 0 ; i < nPrint ; i++ ) ca[ i ] = csx[ i ];
+ for ( i = 0; i < nPrint ; i++ ) ca[ i ] = csx[ i ];
}
- for ( int j = 0 ; j < width - nPrint ; j++, i++ )
+ for ( int j = 0; j < width - nPrint ; j++, i++ )
{
ca[ i ] = ' ';
}
}
else
{
- for ( i = 0 ; i < width - nPrint ; i++ ) ca[ i ] = ' ';
+ for ( i = 0; i < width - nPrint ; i++ ) ca[ i ] = ' ';
if ( nPrint >= x.length() )
{
char[] csx = x.toCharArray();
- for ( int j = 0 ; j < x.length() ; i++, j++ )
+ for ( int j = 0; j < x.length() ; i++, j++ )
{
ca[ i ] = csx[ j ];
}
@@ -3660,7 +3674,7 @@
{
char[] csx =
x.substring( 0, nPrint ).toCharArray();
- for ( int j = 0 ; j < nPrint ; i++, j++ )
+ for ( int j = 0; j < nPrint ; i++, j++ )
{
ca[ i ] = csx[ j ];
}
@@ -3824,7 +3838,7 @@
private void setArgPosition()
{
int xPos;
- for ( xPos = pos ; xPos < fmt.length() ; xPos++ )
+ for ...
[truncated message content] |
|
From: <tri...@us...> - 2007-10-02 21:07:25
|
Revision: 102
http://equanda.svn.sourceforge.net/equanda/?rev=102&view=rev
Author: triathlon98
Date: 2007-10-02 14:07:20 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
improve checkstyle configuration
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/config/equanda-header.txt
trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2007-10-02 08:32:34 UTC (rev 101)
+++ trunk/config/checkstyle.xml 2007-10-02 21:07:20 UTC (rev 102)
@@ -1,52 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
<!DOCTYPE module PUBLIC
"-//Puppy Crawl//DTD Check Configuration 1.1//EN"
"http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
<!--
-
- Checkstyle configuration that checks the sun coding conventions from:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
Checkstyle is very configurable. Be sure to read the documentation at
http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
-->
<module name="Checker">
@@ -61,64 +20,57 @@
<!-- Checks that property files contain the same keys. -->
<!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation"/>
+ <!--<module name="Translation"/>-->
+ <!-- duplicate code, see http://checkstyle.sourceforge.net/config_duplicates.html -->
+ <!--<module name="StrictDuplicateCode"/>-->
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
+ <property name="tabWidth" value="4"/>
+ <property name="charset" value="UTF-8"/>
- <!-- ************************************************************** -->
- <!-- Checks that are different from the sun coding conventions ones -->
- <!-- ************************************************************** -->
- <property name="tabWidth" value="4"/>
+ <!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
+
<module name="LeftCurly">
- <property name="option" value="nl"/>
+ <property name="option" value="nl"/>
</module>
<module name="RightCurly">
- <property name="option" value="alone"/>
+ <property name="option" value="alone"/>
</module>
- <module name="LineLength">
- <property name="ignorePattern" value="@version"/>
- <property name="max" value="132"/>
- </module>
- <module name="MemberName">
- <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
- </module>
- <module name="StaticVariableName">
- <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
- </module>
- <module name="ConstantName">
- <property name="format" value="^(([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)|log)$"/>
- </module>
- <module name="ParameterName">
- <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
- </module>
+ <!--<module name="EmptyBlock"/>-->
+ <module name="AvoidNestedBlocks"/>
+ <module name="NeedBraces"/>
- <!-- ************************************************************** -->
- <!-- Default Sun coding conventions checks -->
- <!-- ************************************************************** -->
+ <!-- Javadoc comments checks, see http://checkstyle.sourceforge.net/config_javadoc.html -->
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
- <property name="excludeScope" value="private"/>
+ <property name="excludeScope" value="private"/>
</module>
<module name="JavadocType"/>
- <module name="JavadocVariable"/>
+ <!--<module name="JavadocVariable"/>-->
+ <!--<module name="JavadocStyle"/>-->
+ <!-- Naming conventions, see http://checkstyle.sourceforge.net/config_naming.html -->
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <!--<module name="AbstractClassName"/>-->
+ <!--<module name="LocalFinalVariableName"/>-->
+ <module name="ConstantName">
+ <property name="format" value="^(([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)|log)$"/>
+ </module>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
+ <module name="MemberName"/>
<module name="MethodName"/>
<module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
<module name="TypeName"/>
+ <!-- header, see http://checkstyle.sourceforge.net/config_header.html -->
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <module name="RegexpHeader">
+ <module name="Header">
<!-- The follow property value demonstrates the ability -->
<!-- to have access to ANT properties. In this case it uses -->
<!-- the ${basedir} property to allow Checkstyle to be run -->
@@ -126,83 +78,144 @@
<property name="headerFile" value="config/equanda-header.txt"/>
</module>
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
+ <!-- imports, see http://checkstyle.sourceforge.net/config_imports.html -->
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <!--<module name="AvoidStarImport"/>-->
+ <module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports"/>
+ <module name="ImportOrder"/>
+ <!--<module name="ImportControl"/>-->
+ <!-- size violations, see http://checkstyle.sourceforge.net/config_sizes.html -->
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
<module name="FileLength"/>
<module name="MethodLength"/>
<module name="ParameterNumber"/>
+ <!-- whitespace, see http://checkstyle.sourceforge.net/config_whitespace.html -->
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
+ <module name="EmptyForInitializerPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="EmptyForIteratorPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter">
+ <!-- Default tokens and additional GENERIC_START -->
+ <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
+ </module>
+ <module name="NoWhitespaceBefore">
+ <!-- Default tokens and additional GENERIC_START and GENERIC_END -->
+ <property name="tokens" value="SEMI, POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
+ </module>
<module name="OperatorWrap"/>
- <module name="ParenPad"/>
+ <module name="ParenPad">
+ <property name="option" value="space"/>
+ </module>
+ <module name="TypecastParenPad"/>
<module name="TabCharacter"/>
+ <module name="WhitespaceAfter">
+ <!-- Default tokens and additional GENERIC_END -->
+ <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
+ </module>
+ <module name="WhitespaceAround">
+ <!-- Default tokens without GENERIC_START and GENERIC_END -->
+ <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ </module>
+ <module name="TabCharacter"/>
<module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
+ <module name="WhitespaceAround">
+ <property name="allowEmptyConstructors" value="true"/>
+ <property name="allowEmptyMethods" value="true"/>
+ </module>
+ <!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
<module name="ModifierOrder"/>
<module name="RedundantModifier"/>
- <module name="EmptyBlock"/>
- <module name="NeedBraces"/>
+ <!-- coding , see http://checkstyle.sourceforge.net/config_coding.html -->
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE -->
+ <module name="ArrayTrailingComma"/>
+ <!--<module name="AvoidInlineConditionals"/>-->
+ <module name="CovariantEquals"/>
+ <module name="DoubleCheckedLocking"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
- <module name="FallThrough"/>
+ <module name="FinalLocalVariable"/>
<module name="HiddenField">
- <property name="ignoreConstructorParameter" value="true"/>
- <property name="ignoreSetter" value="true"/>
+ <property name="ignoreConstructorParameter" value="true"/>
+ <property name="ignoreSetter" value="true"/>
</module>
- <module name="IllegalInstantiation"/>
+ <module name="IllegalInstantiation">
+ <property name="classes" value="java.lang.Boolean"/>
+ </module>
+ <module name="IllegalToken">
+ <property name="tokens" value="LITERAL_NATIVE"/>
+ </module>
+ <module name="IllegalTokenText"/>
<module name="InnerAssignment"/>
<module name="MagicNumber"/>
<module name="MissingSwitchDefault"/>
-<!-- <module name="OneMethodPrivateField" /> -->
+ <module name="ModifiedControlVariable"/>
<module name="RedundantThrows"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <!--<module name="NestedIfDepth"/>-->
+ <!--<module name="NestedTryDepth"/>-->
+ <module name="SuperClone"/>
+ <module name="SuperFinalize"/>
+ <!--<module name="IllegalCatch"/>-->
+ <!--<module name="IllegalThrows"/>-->
+ <module name="PackageDeclaration"/>
+ <module name="JUnitTestCase"/>
+ <module name="ReturnCount"/>
+ <module name="IllegalType"/>
+ <module name="DeclarationOrder"/>
+ <module name="ParameterAssignment"/>
+ <module name="ExplicitInitialization"/>
+ <module name="DefaultComesLast"/>
+ <!--<module name="MissingCtor"/>-->
+ <module name="FallThrough"/>
+ <module name="MultipleStringLiterals"/>
+ <!--<module name="MultipleVariableDeclarations"/>-->
+ <!--<module name="RequireThis"/>-->
+ <!--<module name="UnnecessaryParentheses"/>-->
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!-- class design, see http://checkstyle.sourceforge.net/config_design.html -->
+
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true"/>
+ </module>
<module name="FinalClass"/>
+ <module name="InterfaceIsType"/>
<module name="HideUtilityClassConstructor"/>
- <module name="VisibilityModifier">
- <module name="MissingSwitchDefault"/>
- <property name="protectedAllowed" value="true"/>
- </module>
+ <!--<module name="DesignForExtension"/>-->
+ <!--<module name="MutableException"/>-->
+ <!--<module name="ThrowsCount"/>-->
+ <!-- misc, see http://checkstyle.sourceforge.net/config_misc.html -->
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
-<!-- <module name="FinalParameters"/> -->
<module name="GenericIllegalRegexp">
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
</module>
+ <!--<module name="TodoComment"/>-->
+ <!--<module name="UncommentedMain"/>-->
<module name="UpperEll"/>
+ <module name="ArrayTypeStyle"/>
+ <!--<module name="FinalParameters"/>-->
+ <!--<module name="DescendantToken"/>-->
+ <!--<module name="Indentation"/>-->
+ <!--<module name="TrailingComment"/>-->
+ <!--<module name="RequiredRegexp"/>-->
+ <!--<module name="Regexp"/>-->
</module>
Modified: trunk/config/equanda-header.txt
===================================================================
--- trunk/config/equanda-header.txt 2007-10-02 08:32:34 UTC (rev 101)
+++ trunk/config/equanda-header.txt 2007-10-02 21:07:20 UTC (rev 102)
@@ -1,23 +1,23 @@
-^/\*\*\s*$
-^ \* This file is part of the equanda project.\s*$
-^ \*\s*$
-^ \* The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");\s*$
-^ \* you may not use this file except in compliance with the License.\s*$
-^ \* You may obtain a copy of the License at http://www.mozilla.org/MPL/\s*$
-^ \*\s*$
-^ \* Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF\s*$
-^ \* ANY KIND, either express or implied. See the License for the specific language governing rights and\s*$
-^ \* limitations under the License.\s*$
-^ \*\s*$
-^ \* Alternatively, the contents of this file may be used under the terms of\s*$
-^ \* either the GNU General Public License Version 2 or later (the "GPL"), or\s*$
-^ \* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),\s*$
-^ \* in which case the provisions of the GPL or the LGPL are applicable instead\s*$
-^ \* of those above. If you wish to allow use of your version of this file only\s*$
-^ \* under the terms of either the GPL or the LGPL, and not to allow others to\s*$
-^ \* use your version of this file under the terms of the MPL, indicate your\s*$
-^ \* decision by deleting the provisions above and replace them with the notice\s*$
-^ \* and other provisions required by the GPL or the LGPL. If you do not delete\s*$
-^ \* the provisions above, a recipient may use your version of this file under\s*$
-^ \* the terms of any one of the MPL, the GPL or the LGPL.\s*$
-^ \*/\s*$
\ No newline at end of file
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
Modified: trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java 2007-10-02 08:32:34 UTC (rev 101)
+++ trunk/equanda-util/src/main/java/org/equanda/util/swing/list/ListPalette.java 2007-10-02 21:07:20 UTC (rev 102)
@@ -1,8 +1,29 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
package org.equanda.util.swing.list;
-import org.equanda.util.swing.JSortedList;
-import org.equanda.util.swing.JSortedListModel;
-
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -12,6 +33,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
+import org.equanda.util.swing.JSortedList;
+import org.equanda.util.swing.JSortedListModel;
/**
* This components contains two list :
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-02 08:32:37
|
Revision: 101
http://equanda.svn.sourceforge.net/equanda/?rev=101&view=rev
Author: triathlon98
Date: 2007-10-02 01:32:34 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
EQ-9 translate should only ask exit confirm when there are unsaved changes
Modified Paths:
--------------
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-10-02 08:22:30 UTC (rev 100)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-10-02 08:32:34 UTC (rev 101)
@@ -101,6 +101,7 @@
throws Exception
{
load( config );
+ hasChanged = false;
Dimension frameSize = new Dimension( config.getWidth(), config.getHeight() );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-02 08:22:31
|
Revision: 100
http://equanda.svn.sourceforge.net/equanda/?rev=100&view=rev
Author: triathlon98
Date: 2007-10-02 01:22:30 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
EQ-9 translate should only ask exit confirm when there are unsaved changes
Modified Paths:
--------------
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java 2007-10-02 07:56:20 UTC (rev 99)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java 2007-10-02 08:22:30 UTC (rev 100)
@@ -46,6 +46,9 @@
private String languages[];
private Key key;
private KeyTableModel model;
+ private Runnable hasChanged = new Runnable() {
+ public void run() {}
+ };
public KeyEditorPanel( String languages[], KeyTableModel model )
{
@@ -136,6 +139,7 @@
translation.setHelp( help.getText() );
model.addTranslation( key, language, translation );
}
+ hasChanged.run();
}
/**
@@ -163,4 +167,9 @@
JTextField label = translationsTextFields.get( languages[0] )[ 0 ];
label.requestFocus();
}
+
+ public void setHasChanged( Runnable hasChanged )
+ {
+ this.hasChanged = hasChanged;
+ }
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-10-02 07:56:20 UTC (rev 99)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-10-02 08:22:30 UTC (rev 100)
@@ -68,6 +68,7 @@
private String lastTranslationSearched;
private String lastKeySearched;
private OMDatabase database;
+ private boolean hasChanged;
public static void main( final String args[] )
{
@@ -119,11 +120,15 @@
{
public void run()
{
- int option = JOptionPane.showConfirmDialog( TranslationsEditor.this,
- "Are you sure you want to exit? Did you save the changes?",
+ int option = JOptionPane.OK_OPTION;
+ if ( hasChanged )
+ {
+ option = JOptionPane.showConfirmDialog( TranslationsEditor.this,
+ "Unsaved changes, are you sure you want to exit ?",
"Confirmation",
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE );
+ }
if ( option == JOptionPane.OK_OPTION )
{
if ( waitFor == null )
@@ -208,6 +213,7 @@
// save previous key:
keyEditorPanel.save();
save( config );
+ hasChanged = false;
}
}
);
@@ -338,6 +344,13 @@
JSplitPane contentPanel = new JSplitPane();
keyEditorPanel = new KeyEditorPanel( languages, model );
+ keyEditorPanel.setHasChanged( new Runnable()
+ {
+ public void run()
+ {
+ hasChanged = true;
+ }
+ } );
table = new KeyTable( model );
@@ -367,6 +380,7 @@
{
Key key = new Key( keyStr, null );
model.addKey( key );
+ hasChanged = true;
int index = model.getIndexOfKey( key );
if ( index != -1 )
{
@@ -447,6 +461,7 @@
{
keyEditorPanel.clear();
model.removeKey( selectedRow );
+ hasChanged = true;
if ( selectedRow >= model.getRowCount() ) selectedRow--;
if ( selectedRow == -1 && model.getRowCount() > 0 ) selectedRow = 0;
table.changeSelection( selectedRow, 1, false, false );
@@ -542,7 +557,6 @@
e.printStackTrace();
log.error( e, e );
}
- // if ( addToModel ) System.out.println( "Added " + dbItems.size() + " keys" );
return dbItems;
}
@@ -563,6 +577,7 @@
model.addTranslation( key, "en", translation );
}
}
+ hasChanged = true;
}
private void load( Configuration config )
@@ -587,7 +602,6 @@
model.addTranslation( key, language, mapFromParser.get( key ) );
}
}
- System.out.println( "done" );
System.out.println( "Total: " + model.getRowCount() + " keys." );
}
@@ -638,6 +652,7 @@
}
}
writer.close();
+ hasChanged = false;
}
catch ( IOException e )
{
@@ -672,8 +687,7 @@
keyEditorPanel.save();
keyEditorPanel.setCurrentKey( model.getKeyAtIndex( table.getSelectedRow() ),
- model.getTranslation(
- model.getKeyAtIndex( table.getSelectedRow() ) ) );
+ model.getTranslation( model.getKeyAtIndex( table.getSelectedRow() ) ) );
}
private void showError( String str )
@@ -703,6 +717,7 @@
model.removeKey( i );
log.info( "Removed key " + key.getKey() );
countUnused++;
+ hasChanged = true;
}
else
{
@@ -808,6 +823,7 @@
model.removeKey( i );
}
}
+ hasChanged = true;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-10-02 07:56:24
|
Revision: 99
http://equanda.svn.sourceforge.net/equanda/?rev=99&view=rev
Author: triathlon98
Date: 2007-10-02 00:56:20 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
EQ-55 move focus to first translation when going to next untranslated/searched
Modified Paths:
--------------
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java 2007-09-26 08:24:20 UTC (rev 98)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java 2007-10-02 07:56:20 UTC (rev 99)
@@ -29,15 +29,14 @@
import javax.swing.*;
import java.awt.*;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
import java.util.TreeMap;
import java.util.Map;
/**
- * JPannel with the edit boxes to for label, caption, help for all languages
+ * JPanel with the edit boxes to for label, caption, help for all languages
*
- * @author Florin
+ * @author <a href="mailto:fl...@pa...">Florin</a>
+ * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
public class KeyEditorPanel
extends JPanel
@@ -64,18 +63,18 @@
add( context, constr );
translationsTextFields = new TreeMap<String, JTextField[]>();
- for ( int i = 0; i < languages.length ; i++ )
+ for ( String language : languages )
{
constr.gridy++;
constr.gridx = 0;
add( new JLabel( " " ), constr );
JTextField[] textFields = { new JTextField(), new JTextField(), new JTextField() };
- translationsTextFields.put( languages[ i ], textFields );
+ translationsTextFields.put( language, textFields );
constr.gridy += 2;
constr.gridx = 0;
- add( new JLabel( "Language: " + languages[ i ] ), constr );
+ add( new JLabel( "Language: " + language ), constr );
constr.gridy++;
constr.gridx = 0;
@@ -98,31 +97,19 @@
constr.gridy++;
constr.gridx = 0;
add( new JLabel( " " ), constr );
-
- /*
- constr.gridy++;
- constr.gridx=1;
- JButton buttonSave = new JButton( "Save key" );
- buttonSave.addActionListener( new ActionListener()
- {
- public void actionPerformed( ActionEvent e ) {save();}
- } );
- constr.fill=GridBagConstraints.NONE;
- add( buttonSave, constr );
- */
}
public void setCurrentKey( Key key, Map<String, Translation> translations )
{
this.key = key;
context.setText( key.getContext() );
- for ( int i = 0; i < languages.length ; i++ )
+ for ( String language : languages )
{
- JTextField label = translationsTextFields.get( languages[ i ] )[ 0 ];
- JTextField caption = translationsTextFields.get( languages[ i ] )[ 1 ];
- JTextField help = translationsTextFields.get( languages[ i ] )[ 2 ];
+ JTextField label = translationsTextFields.get( language )[ 0 ];
+ JTextField caption = translationsTextFields.get( language )[ 1 ];
+ JTextField help = translationsTextFields.get( language )[ 2 ];
- Translation trans = translations.get( languages[ i ] );
+ Translation trans = translations.get( language );
label.setText( ( trans != null ) ? trans.getLabel() : null );
caption.setText( ( trans != null ) ? trans.getCaption() : null );
help.setText( ( trans != null ) ? trans.getHelp() : null );
@@ -135,37 +122,45 @@
key.setContext( context.getText() );
TreeMap<String, Translation> translations = model.getTranslation( key );
- for ( int i = 0; i < languages.length ; i++ )
+ for ( String language : languages )
{
- JTextField label = translationsTextFields.get( languages[ i ] )[ 0 ];
- JTextField caption = translationsTextFields.get( languages[ i ] )[ 1 ];
- JTextField help = translationsTextFields.get( languages[ i ] )[ 2 ];
+ JTextField label = translationsTextFields.get( language )[ 0 ];
+ JTextField caption = translationsTextFields.get( language )[ 1 ];
+ JTextField help = translationsTextFields.get( language )[ 2 ];
Translation translation = null;
- if (translations!=null) translation=translations.get( languages[ i ] );
+ if ( translations != null ) translation = translations.get( language );
if ( translation == null ) translation = new Translation();
translation.setLabel( label.getText() );
translation.setCaption( caption.getText() );
translation.setHelp( help.getText() );
- model.addTranslation( key, languages[ i ], translation );
+ model.addTranslation( key, language, translation );
}
}
/**
* 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()
{
context.setText("");
- for ( int i = 0; i < languages.length ; i++ )
+ for ( String language : languages )
{
- JTextField label = translationsTextFields.get( languages[ i ] )[ 0 ];
- JTextField caption = translationsTextFields.get( languages[ i ] )[ 1 ];
- JTextField help = translationsTextFields.get( languages[ i ] )[ 2 ];
- label.setText("");
- caption.setText("");
- help.setText("");
+ JTextField label = translationsTextFields.get( language )[ 0 ];
+ JTextField caption = translationsTextFields.get( language )[ 1 ];
+ JTextField help = translationsTextFields.get( language )[ 2 ];
+ label.setText( "" );
+ caption.setText( "" );
+ help.setText( "" );
}
}
+
+ /**
+ * Put cursor in first translation item.
+ */
+ public void focus()
+ {
+ JTextField label = translationsTextFields.get( languages[0] )[ 0 ];
+ label.requestFocus();
+ }
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-09-26 08:24:20 UTC (rev 98)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java 2007-10-02 07:56:20 UTC (rev 99)
@@ -103,9 +103,6 @@
Dimension frameSize = new Dimension( config.getWidth(), config.getHeight() );
- //setLayout( new BorderLayout() );
-
- //add( getButtonsPanel(), BorderLayout.NORTH );
setJMenuBar( getTranslationsMenuBar( config ) );
add( getContentPanel(), BorderLayout.CENTER );
@@ -246,6 +243,7 @@
{
// save previous key:
keyEditorPanel.save();
+ keyEditorPanel.focus();
addKey();
}
} );
@@ -269,6 +267,7 @@
{
// save previous key:
keyEditorPanel.save();
+ keyEditorPanel.focus();
searchKeyPart();
}
} );
@@ -280,6 +279,7 @@
{
// save previous key:
keyEditorPanel.save();
+ keyEditorPanel.focus();
searchTranslationPart();
}
}
@@ -292,6 +292,7 @@
{
// save previous key:
keyEditorPanel.save();
+ keyEditorPanel.focus();
gotoNextFault();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-26 08:24:21
|
Revision: 98
http://equanda.svn.sourceforge.net/equanda/?rev=98&view=rev
Author: triathlon98
Date: 2007-09-26 01:24:20 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
EQ-49 include ci info
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-09-25 09:57:12 UTC (rev 97)
+++ trunk/pom.xml 2007-09-26 08:24:20 UTC (rev 98)
@@ -51,6 +51,22 @@
</developerConnection>
<url>http://equanda.svn.sourceforge.net/viewvc/equanda/</url>
</scm>
+ <ciManagement>
+ <system>hudson</system>
+ <url>http://hudson.equanda.org/job/equanda</url>
+ <notifiers>
+ <notifier>
+ <type>mail</type>
+ <sendOnError>true</sendOnError>
+ <sendOnFailure>true</sendOnFailure>
+ <sendOnSuccess>true</sendOnSuccess>
+ <sendOnWarning>true</sendOnWarning>
+ <configuration>
+ <address>equ...@li...</address>
+ </configuration>
+ </notifier>
+ </notifiers>
+ </ciManagement>
<mailingLists>
<mailingList>
<name>equanda-svn-commit</name>
@@ -114,7 +130,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-25 09:57:15
|
Revision: 97
http://equanda.svn.sourceforge.net/equanda/?rev=97&view=rev
Author: triathlon98
Date: 2007-09-25 02:57:12 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
EQ-5 small improvements
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm
Modified: trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm 2007-09-25 07:55:25 UTC (rev 96)
+++ trunk/equanda-generate/src/main/velocity/ejb3/DMObjectFinder.java.vm 2007-09-25 09:57:12 UTC (rev 97)
@@ -209,7 +209,7 @@
String sorting = SelectorsState.getSorting( "$table.Name" );
Query query;
#if( !$table.hasDataFilters() )
- if ( sorting == null || sorting.length() > 0 )
+ if ( sorting == null || sorting.length() == 0 )
{
query = getEquandaQuery( em, equandaQuery );
}
Modified: trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm 2007-09-25 07:55:25 UTC (rev 96)
+++ trunk/equanda-generate/src/main/velocity/ejb3/MediatorRoot.java.vm 2007-09-25 09:57:12 UTC (rev 97)
@@ -77,25 +77,22 @@
#if ($field.isMultiple())
#if( !$field.isLink() )
- Collection<$field.JavaFieldType> get${field.Name}() {
+ Collection<$field.JavaFieldType> get${field.Name}()
+ {
Collection<DM${table.Name}_${field.Name}Bean> data=entity.get${field.Name}();
while (true) {
try {
- Iterator it=data.iterator();
- Collection<$field.JavaFieldType> set=new EquandaList<$field.JavaFieldType>();
- while (it.hasNext()) {
+ Collection<$field.JavaFieldType> set = new EquandaList<$field.JavaFieldType>();
#if( !$field.isLink() )
- DM${table.Name}_${field.Name}Bean obj=(DM${table.Name}_${field.Name}Bean)it.next();
-if ( obj == null ) log.error("null in linked collection"); else
- set.add(obj.get${field.Name}());
+ for ( DM${table.Name}_${field.Name}Bean obj : data ) {
+ set.add( obj.get${field.Name}() );
#else
- DM${field.JavaFieldType}Bean obj=(DM${field.JavaFieldType}Bean)it.next();
+ for ( DM${field.JavaFieldType}Bean obj : data ) {
try {
${package}.client.${field.JavaFieldType}EJBLocal add = ${package}.client.EquandaGlobal.get${field.JavaFieldType}Local();
add.initEntity( obj );
set.add( add );
} catch ( Exception e ) {
- log.error( "Could not create session façade", e );
throw new EJBException( "Could not create session façade", e );
}
#end
@@ -108,17 +105,14 @@
}
#else
- Collection<UOID> getEquandaLink${field.Name}() {
- Collection<DM${field.JavaFieldType}Bean> data=entity.get${field.Name}();
- while (true) {
+ Collection<UOID> getEquandaLink${field.Name}()
+ {
+ Collection<DM${field.JavaFieldType}Bean> data = entity.get${field.Name}();
+ while (true)
+ {
try {
- Iterator it=data.iterator();
Collection<UOID> set=new EquandaList<UOID>();
- while (it.hasNext()) {
- DM${field.JavaFieldType}Bean obj=(DM${field.JavaFieldType}Bean)it.next();
-if ( obj == null ) log.error("null in linked collection"); else
- set.add(obj.getUOID());
- }
+ for ( DM${field.JavaFieldType}Bean obj : data ) set.add( obj.getUOID() );
return set;
} catch (IllegalStateException ise) {
// iterator has been modified, retry
@@ -140,32 +134,29 @@
#end
#if( !$field.isLink() )
- boolean has${field.Singular}($fieldtype value) {
+ boolean has${field.Singular}($fieldtype value)
+ {
Collection<DM${table.Name}_${field.Name}Bean> data=entity.get${field.Name}();
- boolean success=false;
- while (!success) {
+ boolean success = false;
+ while ( !success ) {
try {
Iterator it=data.iterator();
- while (it.hasNext()) {
- #if( !$field.isLink() )
- DM${table.Name}_${field.Name}Bean obj=(DM${table.Name}_${field.Name}Bean)it.next();
- #if( $field.isString() || $field.isDate() || $field.isTimestamp() || $field.isLink() )
- if (obj.get${field.Name}().equals(value)) {
- #else
- if (obj.get${field.Name}()==value) {
- #end
+ #if( !$field.isLink() )
+ for ( DM${table.Name}_${field.Name}Bean obj : data ) {
+ #if( $field.isString() || $field.isDate() || $field.isTimestamp() || $field.isLink() )
+ if (obj.get${field.Name}().equals(value)) return true;
#else
- DM${field.JavaFieldType}Bean obj=(DM${field.JavaFieldType}Bean)it.next();
- if (obj.getUOID().equals(value.getUOID())) {
+ if (obj.get${field.Name}()==value) return true;
#end
- return true;
- }
+ #else
+ for ( DM${field.JavaFieldType}Bean obj : data ) {
+ if (obj.getUOID().equals(value.getUOID())) return true;
+ #end
}
} catch (IllegalStateException ise) {
log.warn(ise);
#if( $field.isLink() )
} catch (RemoteException re) {
- log.error("RemoteException", re);
throw new EJBException("Can't get UOID on object for comparing",re);
#end
}
@@ -174,22 +165,19 @@
return false;
}
#else
- boolean hasEquandaLink${field.Singular}(UOID value) {
+ boolean hasEquandaLink${field.Singular}(UOID value)
+ {
Collection<DM${field.JavaFieldType}Bean> data=entity.get${field.Name}();
- boolean success=false;
- while (!success) {
+ boolean success = false;
+ while ( !success ) {
try {
- Iterator it=data.iterator();
- while (it.hasNext()) {
- DM${field.JavaFieldType}Bean obj=(DM${field.JavaFieldType}Bean)it.next();
- if (obj.getUOID().equals(value)) {
- return true;
- }
+ for ( DM${field.JavaFieldType}Bean obj : data ) {
+ if ( obj.getUOID().equals(value) ) return true;
}
- } catch (IllegalStateException ise) {
- log.warn(ise);
+ success = true;
+ } catch ( IllegalStateException ise ) {
+ log.warn( ise );
}
- success=true;
}
return false;
}
@@ -198,11 +186,11 @@
#if( !$field.isAuto() )
#if( !$field.isLink() )
void remove${field.Singular}($fieldtype el) throws EquandaPersistenceException {
- throw new EquandaOperationNotAllowed( UONA_OPERATION_NOT_ALLOWED, "$table.Name, remove$field.Name, "+entity.getEquandaType() );
+ throw new EquandaOperationNotAllowed( UONA_OPERATION_NOT_ALLOWED, "$table.Name, remove$field.Name, " + entity.getEquandaType() );
}
#else
void removeEquandaLink${field.Singular}(UOID el) throws EquandaPersistenceException {
- throw new EquandaOperationNotAllowed( UONA_OPERATION_NOT_ALLOWED, "$table.Name, removeEquandaLink$field.Name, "+ entity.getEquandaType());
+ throw new EquandaOperationNotAllowed( UONA_OPERATION_NOT_ALLOWED, "$table.Name, removeEquandaLink$field.Name, " + entity.getEquandaType());
}
#end
#end
@@ -357,43 +345,32 @@
// entity.get${ck.linkedFieldName}().clear();
// $ck.FieldName ... $ck.linkedFieldName .. $ck.tableName .. $ck.varName ... $ck.isOwner()
Collection<DM${ck.tableName}Bean> col = entity.get${ck.linkedFieldName}();
- Iterator it = col.iterator();
- while ( it.hasNext() )
- {
- DM${ck.tableName}Bean obj = (DM${ck.tableName}Bean)it.next();
- obj.set${ck.FieldName}(null);
- }
+ for ( DM${ck.tableName}Bean obj : col ) obj.set${ck.FieldName}(null);
#end
#else
#if( $ck.isMultiple() )
// case bidir4
- Collection<DM${ck.TableName}Bean> other = entity.get${ck.linkedFieldName}();
- Iterator it = other.iterator();
- while ( it.hasNext() )
+ Collection<DM${ck.TableName}Bean> others = entity.get${ck.linkedFieldName}();
+ for ( DM${ck.TableName}Bean other : others )
{
#set( $fldName=$ck.FieldName )
#if( $ck.isFieldMultiple() )
- // case bidir5
- Collection<DM${table.Name}Bean> col=( (DM${ck.TableName}Bean) it.next() ).get${fldName}();
- Iterator it2 = col.iterator();
- while( it2.hasNext() )
+ Collection<DM${table.Name}Bean> col = other.get${fldName}();
+ for ( DM${table.Name}Bean obj : col )
{
- DM${table.Name}Bean obj = (DM${table.Name}Bean)it2.next();
- if ( obj.getUOID().equals(entity.getUOID()) )
+ if ( obj.getUOID().equals( entity.getUOID() ) )
{
col.remove(obj);
break;
}
}
#else
- // case bidir6
- ( (DM${ck.TableName}Bean) it.next() ).set${fldName}(null);
+ other.set${fldName}( null );
#end
}
#else
- // case bidir7
DM${ck.TableName}Bean other = entity.get${ck.linkedFieldName}();
- other.set${ck.FieldName}(null);
+ other.set${ck.FieldName}( null );
#end
#end
#end ## is Cascade
@@ -409,16 +386,13 @@
#end
#else
Collection<DM${ck.TableName}Bean> other = entity.getEquanda${ck.TableName}${ck.FieldName}();
- Iterator it = other.iterator();
- while ( it.hasNext() )
+ for ( DM${ck.TableName}Bean bean : other )
{
#set( $fldName=$ck.FieldName )
#if( $ck.isFieldMultiple() )
- Collection<DM${table.Name}Bean> col=( (DM${ck.TableName}Bean) it.next() ).get${fldName}();
- Iterator it2 = col.iterator();
- while( it2.hasNext() )
+ Collection<DM${table.Name}Bean> col = bean.get${fldName}();
+ for ( DM${table.Name}Bean obj : col )
{
- DM${table.Name}Bean obj = (DM${table.Name}Bean)it2.next();
if ( obj.getUOID().equals(entity.getUOID()) )
{
col.remove(obj);
@@ -426,7 +400,7 @@
}
}
#else
- ( (DM${ck.TableName}Bean) it.next() ).set${fldName}(null);
+ bean.set${fldName}( null );
#end
}
#end
@@ -450,13 +424,11 @@
{
Collection<DM${field.LinkTable.Name}Bean> col = entity.get${field.Name}();
Collection<UOID> colTmp = new ArrayList<UOID>();
- Iterator it = col.iterator();
- while( it.hasNext() ) colTmp.add( (( DM${field.LinkTable.Name}Bean ) it.next()).getUOID() );
- it = colTmp.iterator();
+ for ( DM${field.LinkTable.Name}Bean colit : col ) colTmp.add( colit.getUOID() );
${field.LinkTable.Name}EJBLocal remEjb = EquandaGlobal.get${field.LinkTable.Name}Local();
- while( it.hasNext() )
+ for ( UOID colit : colTmp )
{
- remEjb.init( (UOID)it.next() );
+ remEjb.init( colit );
remEjb.removeEntityBean();
}
remEjb.remove();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-25 07:55:26
|
Revision: 96
http://equanda.svn.sourceforge.net/equanda/?rev=96&view=rev
Author: triathlon98
Date: 2007-09-25 00:55:25 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
EQ-5 cleanup error catching (less rethrowing)
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EmbeddedTest.java
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm 2007-09-25 06:36:30 UTC (rev 95)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectBean.java.vm 2007-09-25 07:55:25 UTC (rev 96)
@@ -138,12 +138,7 @@
#foreach( $field in $table.Fields )
#if ($field.isDefaultAuto())
#set( $value="mediator.auto${field.Name}()")
- try {
- entity.set${field.Name}($value);
- } catch ( Exception upe )
- {
- throw new EquandaPersistenceException( UPE_AUTO_FIELD_PROBLEM, "field.${table.Name}.${field.Name}.label" );
- }
+ entity.set${field.Name}($value);
#end
#end
}
@@ -238,10 +233,10 @@
uoid = entity.getUOID();
try {
mediator.create();
- } catch(EquandaPersistenceException pe) {
+ } catch( EquandaPersistenceException pe ) {
/* should not happen */
- log.error("oops, unexpected problem", pe);
- throw new EJBException("error while creating object",pe);
+ log.error( "oops, unexpected problem", pe );
+ throw new EJBException( "error while creating object", pe );
}
}
@@ -291,10 +286,10 @@
uoid = entity.getUOID();
try {
mediator.create();
- } catch(EquandaPersistenceException pe) {
+ } catch( EquandaPersistenceException pe ) {
/* should not happen */
- log.error("oops, unexpected problem", pe);
- throw new EJBException("error while creating object",pe);
+ log.error( "oops, unexpected problem", pe );
+ throw new EJBException( "error while creating object", pe );
}
}
@@ -628,11 +623,11 @@
try
{
#if( $field.isLink() )
- UOID id=null;
- if ($field.VarName!=null) id=${field.VarName}.getUOID();
- mediator.setEquandaLink${field.Name}(id);
+ UOID id = null;
+ if ( $field.VarName != null ) id = ${field.VarName}.getUOID();
+ mediator.setEquandaLink${field.Name}( id );
#else
- mediator.set${field.Name}($field.VarName);
+ mediator.set${field.Name}( $field.VarName );
#end
if ( CheckRulesState.getCheckRules() ) mediator.equandaCheckRules();
}
@@ -653,7 +648,7 @@
mediator.init( entityManager );
try
{
- mediator.setEquandaLink${field.Name}($field.VarName);
+ mediator.setEquandaLink${field.Name}( $field.VarName );
if ( CheckRulesState.getCheckRules() ) mediator.equandaCheckRules();
}
catch ( EquandaDowngradeException ude )
@@ -678,7 +673,7 @@
throws EquandaPersistenceException
{
mediator.init( entityManager );
- #if( $action.Return!="void" )$action.Return res =#end mediator.${action.Name}(
+ #if( $action.Return!="void" )$action.Return res = #end mediator.${action.Name}(
$action.ParametersList
);
if ( CheckRulesState.getCheckRules() ) mediator.equandaCheckRules();
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2007-09-25 06:36:30 UTC (rev 95)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2007-09-25 07:55:25 UTC (rev 96)
@@ -119,45 +119,38 @@
public String getEquandaName() { return "${table.Name}Selector"; }
#macro( loadDefaultFromClass $field )
- try
- {
- org.equanda.validation.Default validator=(org.equanda.validation.Default)Thread.currentThread().getContextClassLoader().loadClass("${field.Default}").newInstance();
- #if ($field.isString())
- proxy.set${field.Name}(validator.getDefaultString());
- #end
- #if ($field.isBoolean())
- proxy.set${field.Name}(validator.getDefaultBoolean());
- #end
- #if ($field.isDate())
- proxy.set${field.Name}(validator.getDefaultDate());
- #end
- #if ($field.isTimestamp())
- proxy.set${field.Name}(validator.getDefaultTimestamp());
- #end
- #if ($field.isInt())
- proxy.set${field.Name}(validator.getDefaultInt());
- #end
- #if ($field.isDouble())
- proxy.set${field.Name}(validator.getDefaultDouble());
- #end
- #if ($field.isBlob())
- proxy.set${field.Name}(validator.getDefaultBlob());
- #end
+ org.equanda.validation.Default validator=(org.equanda.validation.Default)Thread.currentThread().getContextClassLoader().loadClass("${field.Default}").newInstance();
+ #if ($field.isString())
+ proxy.set${field.Name}(validator.getDefaultString());
+ #end
+ #if ($field.isBoolean())
+ proxy.set${field.Name}(validator.getDefaultBoolean());
+ #end
+ #if ($field.isDate())
+ proxy.set${field.Name}(validator.getDefaultDate());
+ #end
+ #if ($field.isTimestamp())
+ proxy.set${field.Name}(validator.getDefaultTimestamp());
+ #end
+ #if ($field.isInt())
+ proxy.set${field.Name}(validator.getDefaultInt());
+ #end
+ #if ($field.isDouble())
+ proxy.set${field.Name}(validator.getDefaultDouble());
+ #end
+ #if ($field.isBlob())
+ proxy.set${field.Name}(validator.getDefaultBlob());
+ #end
- #if ($field.isClob())
- proxy.set${field.Name}(validator.getDefaultClob());
- #end
- }
- catch (Exception e)
- {
- // not important if we cannot set the default value, we must continue without it
- log.error(e, e);
- }
+ #if ($field.isClob())
+ proxy.set${field.Name}(validator.getDefaultClob());
+ #end
#end
@PermitAll
public ${package}.client.${table.Name} equandaCreate( String type )
{
+ try {
${package}.client.${table.Name} proxy = new ${package}.client.${table.Name}();
if ( type != null ) proxy.setEquandaType( type );
#set( $currentTableType="unknown" )
@@ -184,6 +177,7 @@
#end ## foreach field
#if( $currentTableType!="unknown" ) } #end
return proxy;
+ } catch ( Exception ex ) { throw new EJBException( ex ); }
}
@PermitAll
@@ -191,18 +185,11 @@
throws EquandaPersistenceException
{
if ( uoid == null ) return null;
- try
- {
- ${table.Name}EJBLocal bean = EquandaGlobal.get${table.Name}Local();
- bean.init( uoid );
- ${package}.client.${table.Name} res = bean.getEquanda();
- bean.remove();
- return res;
- }
- catch ( Exception e)
- {
- throw new EquandaPersistenceException( UPE_CANNOT_CREATE_SESSION_FACADE, e, "findUOID " + uoid.getId() );
- }
+ ${table.Name}EJBLocal bean = EquandaGlobal.get${table.Name}Local();
+ bean.init( uoid );
+ ${package}.client.${table.Name} res = bean.getEquanda();
+ bean.remove();
+ return res;
}
@PermitAll
@@ -210,16 +197,9 @@
throws EquandaPersistenceException
{
if ( uoid == null ) return null;
- try
- {
- ${table.Name}EJB bean = EquandaGlobal.get${table.Name}();
- bean.init( uoid );
- return bean;
- }
- catch ( Exception e)
- {
- throw new EquandaPersistenceException( UPE_CANNOT_CREATE_SESSION_FACADE, e, "findUOIDEJB " + uoid.getId() );
- }
+ ${table.Name}EJB bean = EquandaGlobal.get${table.Name}();
+ bean.init( uoid );
+ return bean;
}
/*
@@ -456,18 +436,12 @@
$build.ParametersListWithTypes
) throws EquandaPersistenceException
{
- try {
- ${table.Name}SelectorHelper helper = new ${table.Name}SelectorHelper( entityManager );
- ${table.Name}EJB obj = helper.build${build.Name}(
- $build.ParametersList
- );
- #parse("ObjectSelector-build.java.vm")
- return obj;
- } catch( EquandaPersistenceException upe ) {
- throw upe;
- } catch(Exception ex) {
- throw new EquandaPersistenceException(ex);
- }
+ ${table.Name}SelectorHelper helper = new ${table.Name}SelectorHelper( entityManager );
+ ${table.Name}EJB obj = helper.build${build.Name}(
+ $build.ParametersList
+ );
+ #parse("ObjectSelector-build.java.vm")
+ return obj;
}
/*
@@ -478,18 +452,12 @@
$build.ParametersListWithTypes
) throws EquandaPersistenceException
{
- try {
- ${table.Name}SelectorHelper helper = new ${table.Name}SelectorHelper( entityManager );
- ${table.Name}EJB obj = build${build.Name}EJB( $build.ParametersList );
- entityManager.flush(); // force save to have correct equandaModification and equandaStatus fields
- ${package}.client.${table.Name} res = obj.getEquanda();
- obj.remove();
- return res;
- } catch( EquandaPersistenceException upe ) {
- throw upe;
- } catch(Exception ex) {
- throw new EquandaPersistenceException(ex);
- }
+ ${table.Name}SelectorHelper helper = new ${table.Name}SelectorHelper( entityManager );
+ ${table.Name}EJB obj = build${build.Name}EJB( $build.ParametersList );
+ entityManager.flush(); // force save to have correct equandaModification and equandaStatus fields
+ ${package}.client.${table.Name} res = obj.getEquanda();
+ obj.remove();
+ return res;
}
#else
#if( $table.isCloneable() )
@@ -498,19 +466,13 @@
*/
#buildSecurityRole( $build )
public ${table.Name}EJB build${build.Name}EJB(String type, UOID base) throws EquandaPersistenceException {
- try {
- ${table.Name}EJB baseObj = EquandaGlobal.get${table.Name}();
- baseObj.init( base );
- ${table.Name}EJB obj = EquandaGlobal.get${table.Name}();
- obj.init( type, baseObj );
- #parse("ObjectSelector-build.java.vm")
- baseObj.remove();
- return obj;
- } catch( EquandaPersistenceException upe ) {
- throw upe;
- } catch(Exception ex) {
- throw new EquandaPersistenceException(ex);
- }
+ ${table.Name}EJB baseObj = EquandaGlobal.get${table.Name}();
+ baseObj.init( base );
+ ${table.Name}EJB obj = EquandaGlobal.get${table.Name}();
+ obj.init( type, baseObj );
+ #parse("ObjectSelector-build.java.vm")
+ baseObj.remove();
+ return obj;
}
/*
@@ -518,17 +480,11 @@
*/
#buildSecurityRole( $build )
public ${package}.client.${table.Name} build${build.Name}(String type, UOID base) throws EquandaPersistenceException {
- try {
- ${table.Name}EJB obj = build${build.Name}EJB( type, base );
- entityManager.flush(); // force save to have correct equandaModification and equandaStatus fields
- ${package}.client.${table.Name} res = obj.getEquanda();
- obj.remove();
- return res;
- } catch( EquandaPersistenceException upe ) {
- throw upe;
- } catch( Exception ex ) {
- throw new EquandaPersistenceException(ex);
- }
+ ${table.Name}EJB obj = build${build.Name}EJB( type, base );
+ entityManager.flush(); // force save to have correct equandaModification and equandaStatus fields
+ ${package}.client.${table.Name} res = obj.getEquanda();
+ obj.remove();
+ return res;
}
#end ##if isCloneable
@@ -541,29 +497,23 @@
*/
#tableSecurityRole( $table )
public ${package}.client.${table.Name} equandaUpdate( ${package}.client.${table.Name} proxy ) throws EquandaPersistenceException {
- try {
- ${table.Name}EJBLocal obj = EquandaGlobal.get${table.Name}Local();
- UOID uoid = proxy.getUOID();
- if ( uoid == null )
- obj.init( proxy.getEquandaType()
- #foreach( $field in $table.Fields ) #if( $field.isImmutable() ) , proxy.get${field.Name}() #set( $sep="," ) #end #end
- );
- else
- obj.init( uoid );
- obj.updateEquanda( proxy );
- entityManager.flush(); // force save to have correct equandaModification and equandaStatus fields
- ${package}.client.${table.Name} objProxy = findUOID( obj.getUOID() );
- obj.remove();
- if ( objProxy == null )
- {
- throw new EquandaPersistenceException( UPE_FAILED_TO_UPDATE_VALUE, uoid.toString() );
- }
- return objProxy;
- } catch( EquandaPersistenceException pe ) {
- throw pe;
- } catch(Exception ex) {
- throw new EquandaPersistenceException( UPE_FAILED_TO_UPDATE_VALUE, ex );
+ ${table.Name}EJBLocal obj = EquandaGlobal.get${table.Name}Local();
+ UOID uoid = proxy.getUOID();
+ if ( uoid == null )
+ obj.init( proxy.getEquandaType()
+ #foreach( $field in $table.Fields ) #if( $field.isImmutable() ) , proxy.get${field.Name}() #set( $sep="," ) #end #end
+ );
+ else
+ obj.init( uoid );
+ obj.updateEquanda( proxy );
+ entityManager.flush(); // force save to have correct equandaModification and equandaStatus fields
+ ${package}.client.${table.Name} objProxy = findUOID( obj.getUOID() );
+ obj.remove();
+ if ( objProxy == null )
+ {
+ throw new EquandaPersistenceException( UPE_FAILED_TO_UPDATE_VALUE, uoid.toString() );
}
+ return objProxy;
}
/*
@@ -571,22 +521,16 @@
*/
@RolesAllowed({ "LocalUser" ,"LocalAdmin" })
public ${package}.client.${table.Name} equandaRefresh( UOID uoid, long version ) throws EquandaPersistenceException {
- try {
- if ( uoid == null ) return null;
- ${table.Name}EJBLocal obj = EquandaGlobal.get${table.Name}Local();
- ${package}.client.${table.Name} objProxy = findUOID( uoid );
- obj.remove();
- if ( objProxy == null )
- {
- throw new EquandaPersistenceException( UPE_FAILED_TO_UPDATE_VALUE, uoid.toString() );
- }
- if ( objProxy.getEquandaVersion() == version ) return null;
- return objProxy;
- } catch( EquandaPersistenceException pe ) {
- throw pe;
- } catch(Exception ex) {
- throw new EquandaPersistenceException( UPE_FAILED_TO_UPDATE_VALUE, ex );
+ if ( uoid == null ) return null;
+ ${table.Name}EJBLocal obj = EquandaGlobal.get${table.Name}Local();
+ ${package}.client.${table.Name} objProxy = findUOID( uoid );
+ obj.remove();
+ if ( objProxy == null )
+ {
+ throw new EquandaPersistenceException( UPE_FAILED_TO_UPDATE_VALUE, uoid.toString() );
}
+ if ( objProxy.getEquandaVersion() == version ) return null;
+ return objProxy;
}
@@ -610,10 +554,6 @@
#if( $action.Return!="void" )return #end obj.${action.Name}(
$action.ParametersList
);
- } catch(EquandaPersistenceException ex) {
- throw ex;
- } catch(Exception ex) {
- throw new EquandaPersistenceException(ex);
} finally {
if ( obj != null ) obj.remove();
}
@@ -640,10 +580,6 @@
#if( $action.Return!="void" )return #end obj.${action.Name}(
$action.ParametersList
);
- } catch(EquandaPersistenceException ex) {
- throw ex;
- } catch(Exception ex) {
- throw new EquandaPersistenceException(ex);
} finally {
if ( obj != null ) obj.remove();
}
@@ -696,38 +632,31 @@
{
if ( uoid == null ) return null;
$fieldtype res;
- try
- {
- ${table.Name}EJBLocal bean = EquandaGlobal.get${table.Name}Local();
- bean.init( uoid );
+ ${table.Name}EJBLocal bean = EquandaGlobal.get${table.Name}Local();
+ bean.init( uoid );
- #if( !$field.isMultiple() )
- res = null;
- ${field.JavaFieldType}EJB other = bean.get${field.Name}();
- if ( other != null )
- {
- res = other.getEquanda();
- other.remove();
- }
- #else ## isMultiple
- #if( !$field.isLink() )
- res = bean.get${field.Name}();
- #else
- res = new ArrayList<${package}.client.${field.JavaFieldType}>();
- for ( ${field.JavaFieldType}EJB al : bean.get${field.Name}() )
- {
- res.add( al.getEquanda() );
- al.remove();
- }
- #end
- #end
- bean.remove();
- return res;
+ #if( !$field.isMultiple() )
+ res = null;
+ ${field.JavaFieldType}EJB other = bean.get${field.Name}();
+ if ( other != null )
+ {
+ res = other.getEquanda();
+ other.remove();
}
- catch ( Exception e)
+ #else ## isMultiple
+ #if( !$field.isLink() )
+ res = bean.get${field.Name}();
+ #else
+ res = new ArrayList<${package}.client.${field.JavaFieldType}>();
+ for ( ${field.JavaFieldType}EJB al : bean.get${field.Name}() )
{
- throw new EquandaPersistenceException( UPE_CANNOT_CREATE_SESSION_FACADE, e, "getEquanda${field.Name} " + uoid.getId() );
+ res.add( al.getEquanda() );
+ al.remove();
}
+ #end
+ #end
+ bean.remove();
+ return res;
}
#end
#end
@@ -739,16 +668,9 @@
{
return null;
}
- try
- {
- ${table.Name}EJB bean = EquandaGlobal.get${table.Name}();
- bean.init( entity.getUOID() );
- return bean;
- } catch( EquandaPersistenceException upe ) {
- throw upe;
- } catch( Exception ex ) {
- throw new EquandaPersistenceException( ex );
- }
+ ${table.Name}EJB bean = EquandaGlobal.get${table.Name}();
+ bean.init( entity.getUOID() );
+ return bean;
}
private ${table.Name}EJB getEJB( EquandaQuery query )
@@ -767,18 +689,11 @@
{
return null;
}
- try
- {
- ${table.Name}EJB bean = EquandaGlobal.get${table.Name}();
- bean.init( entity.getUOID() );
- ${package}.client.${table.Name} res = bean.getEquanda();
- bean.remove();
- return res;
- } catch( EquandaPersistenceException upe ) {
- throw upe;
- } catch( Exception ex ) {
- throw new EquandaPersistenceException( ex );
- }
+ ${table.Name}EJB bean = EquandaGlobal.get${table.Name}();
+ bean.init( entity.getUOID() );
+ ${package}.client.${table.Name} res = bean.getEquanda();
+ bean.remove();
+ return res;
}
private ${package}.client.${table.Name} get( EquandaQuery query )
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EmbeddedTest.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EmbeddedTest.java 2007-09-25 06:36:30 UTC (rev 95)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EmbeddedTest.java 2007-09-25 07:55:25 UTC (rev 96)
@@ -1,6 +1,7 @@
package org.equanda.test.xejb;
import org.equanda.persistence.om.EquandaPersistenceException;
+import org.equanda.persistence.om.ExceptionCodes;
import org.equanda.test.om.client.EquandaGlobal;
import org.equanda.test.om.client.LazyInst;
import org.equanda.test.om.client.LazyInstSelectorEJB;
@@ -44,7 +45,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 90001 );
+ assertEquals( ExceptionCodes.UPE_UOID_NOT_FOUND, e.getExceptionCode() );
}
finally
{
@@ -75,7 +76,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 91017 );
+ assertEquals( 91017, e.getExceptionCode() );
}
}
@@ -104,7 +105,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 90001 );
+ assertEquals( ExceptionCodes.UPE_UOID_NOT_FOUND, e.getExceptionCode() );
}
finally
{
@@ -142,7 +143,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 90001 );
+ assertEquals( ExceptionCodes.UPE_UOID_NOT_FOUND, e.getExceptionCode() );
}
finally
{
@@ -174,7 +175,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 90001 );
+ assertEquals( ExceptionCodes.UPE_UOID_NOT_FOUND, e.getExceptionCode() );
}
finally
{
@@ -212,7 +213,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 90001 );
+ assertEquals( ExceptionCodes.UPE_UOID_NOT_FOUND, e.getExceptionCode() );
}
finally
{
@@ -245,7 +246,7 @@
catch ( EquandaPersistenceException e )
{
e.printStackTrace();
- assertEquals( e.getExceptionCode(), 91017 );
+ assertEquals( ExceptionCodes.ECV_OTHERSIDE_EMBEDDED_FIELD_IMMUTABLE_ONCE_SET, e.getExceptionCode() );
}
}
@@ -274,7 +275,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 90001 );
+ assertEquals( ExceptionCodes.UPE_UOID_NOT_FOUND, e.getExceptionCode() );
}
finally
{
@@ -312,7 +313,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 90001 );
+ assertEquals( ExceptionCodes.UPE_UOID_NOT_FOUND, e.getExceptionCode() );
}
finally
{
@@ -344,7 +345,7 @@
}
catch ( EquandaPersistenceException e )
{
- assertEquals( e.getExceptionCode(), 90001 );
+ assertEquals( ExceptionCodes.UPE_UOID_NOT_FOUND, e.getExceptionCode() );
}
finally
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-25 06:36:32
|
Revision: 95
http://equanda.svn.sourceforge.net/equanda/?rev=95&view=rev
Author: triathlon98
Date: 2007-09-24 23:36:30 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
EQ-50 removed findXxxUOID variants
Modified Paths:
--------------
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EquandaQueryTest.java
trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsSortingTest.java
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2007-09-24 15:37:53 UTC (rev 94)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2007-09-25 06:36:30 UTC (rev 95)
@@ -396,23 +396,6 @@
return convertList( equandaFind${select.Name}( $select.ParametersList ) );
#end
}
-
-#set( $return="List<UOID>" )
-#if( $select.isSingle() )#set( $return="UOID" )#end
- #selectSecurityRole( $select )
- public $return find${select.Name}UOID( $select.ParametersListWithTypes )
- throws EquandaPersistenceException
- {
- #set( $return="List<DM${table.Name}Bean>" )
- #if( $select.isSingle() )#set( $return="DM${table.Name}Bean" )#end
- $return val = equandaFind${select.Name}( $select.ParametersList );
-
- #if( $select.isSingle() )
- return val.getUOID();
- #else ## is multiple
- return getUOIDs( val );
- #end
- }
#else##select.hasSubselects
private EquandaQuery equandaFind${select.Name}( $select.ParametersListWithTypes )
throws EquandaPersistenceException
@@ -450,19 +433,6 @@
return getLazyList( equandaFind${select.Name}( $select.ParametersList ) );
#end
}
-
-#set( $return="List<UOID>" )
-#if( $select.isSingle() )#set( $return="UOID" )#end
- #selectSecurityRole( $select )
- public $return find${select.Name}UOID( $select.ParametersListWithTypes )
- throws EquandaPersistenceException
- {
- #if( $select.isSingle() )
- return getUOID( equandaFind${select.Name}( $select.ParametersList ) );
- #else ## is multiple
- return getUOIDs( equandaFind${select.Name}( $select.ParametersList ) );
- #end
- }
#end##select.hasSubselects
#end ##macro createFinders
@@ -725,15 +695,16 @@
throws EquandaPersistenceException
{
if ( uoid == null ) return null;
- $fieldtype res = null;
+ $fieldtype res;
try
{
${table.Name}EJBLocal bean = EquandaGlobal.get${table.Name}Local();
bean.init( uoid );
#if( !$field.isMultiple() )
+ res = null;
${field.JavaFieldType}EJB other = bean.get${field.Name}();
- if ( other!=null )
+ if ( other != null )
{
res = other.getEquanda();
other.remove();
@@ -819,37 +790,6 @@
return get( list.get( 0 ) );
}
- private UOID getUOID( EquandaQuery query )
- {
- if ( query == null ) return null;
- List<DM${table.Name}Bean> list = DM${table.Name}Finder.equandaRunQuery( entityManager, query );
- if ( list.size() == 0 ) return null;
- return list.get( 0 ).getUOID();
- }
-
- private List<UOID> getUOIDs( List<DM${table.Name}Bean> entities )
- {
- List<UOID> uoidsCollection = new ArrayList<UOID>();
- for( DM${table.Name}Bean obj : entities )
- {
- uoidsCollection.add( obj.getUOID() );
- }
- return uoidsCollection;
- }
-
- private List<UOID> getUOIDs( EquandaQuery query )
- {
- List<UOID> uoidsCollection = new ArrayList<UOID>();
- if ( query == null ) return uoidsCollection;
- List<DM${table.Name}Bean> entities = DM${table.Name}Finder.equandaRunQuery( entityManager, query );
- for( DM${table.Name}Bean obj : entities )
- {
- uoidsCollection.add( obj.getUOID() );
- }
- return uoidsCollection;
- }
-
-
private List<${table.Name}EJB> getLazyEJBList( EquandaQuery query )
throws EquandaPersistenceException
{
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm 2007-09-24 15:37:53 UTC (rev 94)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorEJB.java.vm 2007-09-25 06:36:30 UTC (rev 95)
@@ -63,12 +63,7 @@
$return find${select.Name}( $select.ParametersListWithTypes )
throws EquandaPersistenceException;
-#set( $return="List<UOID>" )
-#if( $select.isSingle() )#set( $return="UOID" )#end
- $return find${select.Name}UOID( $select.ParametersListWithTypes )
- throws EquandaPersistenceException;
#end ##macro
-
#foreach ($select in $table.Selects)
#selectFinders( $select $table )
#end
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EquandaQueryTest.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EquandaQueryTest.java 2007-09-24 15:37:53 UTC (rev 94)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/EquandaQueryTest.java 2007-09-25 06:36:30 UTC (rev 95)
@@ -25,7 +25,6 @@
package org.equanda.test.xejb;
import org.equanda.persistence.om.EquandaPersistenceException;
-import org.equanda.persistence.om.UOID;
import org.equanda.persistence.om.query.EquandaQuery;
import org.equanda.persistence.om.query.EquandaQueryImpl;
import org.equanda.test.om.client.*;
@@ -305,10 +304,8 @@
throws Exception
{
CarSelectorEJB csel = EquandaGlobal.getCarSelector();
- List<UOID> uoids = csel.findEquandaAllUOID();
- for ( UOID uoid : uoids )
+ for ( Car car : csel.findEquandaAll() )
{
- Car car = csel.findUOID( uoid );
car.removeEntityBean();
}
csel.remove();
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsSortingTest.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsSortingTest.java 2007-09-24 15:37:53 UTC (rev 94)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/xejb/SelectorsSortingTest.java 2007-09-25 06:36:30 UTC (rev 95)
@@ -25,7 +25,6 @@
package org.equanda.test.xejb;
import org.equanda.persistence.om.SelectorsState;
-import org.equanda.persistence.om.UOID;
import org.equanda.persistence.om.query.EquandaQuery;
import org.equanda.persistence.om.query.EquandaQueryImpl;
import org.equanda.test.om.client.CocoonMan;
@@ -46,14 +45,8 @@
throws Exception
{
CocoonManSelectorEJB sel = EquandaGlobal.getCocoonManSelector();
- List<UOID> uoids = sel.findEquandaAllUOID();
- for (UOID uoid:uoids)
- {
- CocoonMan proxy=sel.findUOID(uoid);
- proxy.removeEntityBean();
- }
+ for ( CocoonMan cm : sel.findEquandaAll() ) cm.removeEntityBean();
-
CocoonMan proxy1 = createCocoonMan( "C" );
CocoonMan proxy2 = createCocoonMan( "A" );
CocoonMan proxy3 = createCocoonMan( "B" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tri...@us...> - 2007-09-24 15:40:40
|
Revision: 94
http://equanda.svn.sourceforge.net/equanda/?rev=94&view=rev
Author: triathlon98
Date: 2007-09-24 08:37:53 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
EQ-5 fix some warnings
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/export/ExportFieldEvaluator.java
trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
trunk/equanda-server/src/main/java/org/equanda/cache/EquandaBasicCacheLoader.java
trunk/equanda-server/src/main/java/org/equanda/translations/TranslatorBean.java
trunk/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java
trunk/equanda-server/src/main/java/org/equanda/validation/ISOCountry2Letter.java
trunk/equanda-server/src/main/java/org/equanda/validation/ISOLanguage2Letter.java
trunk/equanda-server/src/main/java/org/equanda/ymport/DatabaseMap.java
trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java
trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMap.java
trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java
trunk/equanda-server/src/main/java/org/equanda/ymport/ImportParser.java
trunk/equanda-server/src/main/java/org/equanda/ymport/ImportServletUtil.java
trunk/equanda-server/src/main/java/org/equanda/ymport/Servlet.java
trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java
Modified: trunk/equanda-client/src/main/java/org/equanda/export/ExportFieldEvaluator.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/ExportFieldEvaluator.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-client/src/main/java/org/equanda/export/ExportFieldEvaluator.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -37,24 +37,24 @@
public class ExportFieldEvaluator
implements ExportEvaluator
{
- protected EquandaProxy value;
+ protected EquandaProxy proxy;
/**
* Create an evaluator for a specific EquandaProxy object
*
- * @param value
+ * @param proxy proxy
*/
- public ExportFieldEvaluator( EquandaProxy value )
+ public ExportFieldEvaluator( EquandaProxy proxy )
{
- this.value = value;
+ this.proxy = proxy;
}
/**
* evaluate expression using reflection
*
- * @param expression
- * @return
- * @throws ExportException
+ * @param expression expression to evaluate
+ * @return evalutaed expression
+ * @throws ExportException oops
*/
public Object getParentContext( String expression )
throws ExportException
@@ -64,8 +64,8 @@
TextBuilder methodName = TextBuilder.newInstance();
methodName.append( "get" );
methodName.append( expression );
- Method method = value.getClass().getMethod( methodName.toString() );
- Object ret = method.invoke( value );
+ Method method = proxy.getClass().getMethod( methodName.toString() );
+ Object ret = method.invoke( proxy );
if ( ret instanceof EquandaProxy )
{
ret = ( (EquandaProxy) ret ).getUOID();
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/om/ObjectFinder.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -141,10 +141,6 @@
return addFilter( query, filter.toString() );
}
- /*
- * count EquandaQuery
- */
-
/**
* Get query string for the count query
*
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2007-09-24 15:37:53 UTC (rev 94)
@@ -363,8 +363,6 @@
private $return equandaFind${select.Name}( $select.ParametersListWithTypes )
throws EquandaPersistenceException
{
- $return val;
-
#checkFinderParameters( $select )
#set( $sep = ", " )
#if( $select.ParametersList == "" )#set( $sep = "" )#end
@@ -379,14 +377,10 @@
public $return find${select.Name}EJB( $select.ParametersListWithTypes )
throws EquandaPersistenceException
{
- #set( $return="List<DM${table.Name}Bean>" )
- #if( $select.isSingle() )#set( $return="DM${table.Name}Bean" )#end
- $return val = equandaFind${select.Name}( $select.ParametersList );
-
#if( $select.isSingle() )
- return getEJB( val );
+ return getEJB( equandaFind${select.Name}( $select.ParametersList ) );
#else ## is multiple
- return convertListEJB( val );
+ return convertListEJB( equandaFind${select.Name}( $select.ParametersList ) );
#end
}
@@ -396,14 +390,10 @@
public $return find${select.Name}( $select.ParametersListWithTypes )
throws EquandaPersistenceException
{
- #set( $return="List<DM${table.Name}Bean>" )
- #if( $select.isSingle() )#set( $return="DM${table.Name}Bean" )#end
- $return val = equandaFind${select.Name}( $select.ParametersList );
-
#if( $select.isSingle() )
- return get( val );
+ return get( equandaFind${select.Name}( $select.ParametersList ) );
#else ## is multiple
- return convertList( val );
+ return convertList( equandaFind${select.Name}( $select.ParametersList ) );
#end
}
@@ -839,7 +829,7 @@
private List<UOID> getUOIDs( List<DM${table.Name}Bean> entities )
{
- List<UOID> uoidsCollection = new ArrayList();
+ List<UOID> uoidsCollection = new ArrayList<UOID>();
for( DM${table.Name}Bean obj : entities )
{
uoidsCollection.add( obj.getUOID() );
@@ -849,7 +839,7 @@
private List<UOID> getUOIDs( EquandaQuery query )
{
- List<UOID> uoidsCollection = new ArrayList();
+ List<UOID> uoidsCollection = new ArrayList<UOID>();
if ( query == null ) return uoidsCollection;
List<DM${table.Name}Bean> entities = DM${table.Name}Finder.equandaRunQuery( entityManager, query );
for( DM${table.Name}Bean obj : entities )
@@ -867,12 +857,6 @@
return new LazyEJBList<${package}.client.${table.Name}, ${table.Name}EJB, ${table.Name}SelectorEJB>( "${table.Name}", query );
}
- private List<${table.Name}EJB> getLazyEJBList( List<EquandaQuery> queries , boolean addOperand, int equandaLimit )
- throws EquandaPersistenceException
- {
- return new LazyEJBList<${package}.client.${table.Name}, ${table.Name}EJB, ${table.Name}SelectorEJB>( "${table.Name}", queries, addOperand, equandaLimit);
- }
-
private List<${package}.client.${table.Name}> getLazyList( EquandaQuery query )
throws EquandaPersistenceException
{
@@ -880,12 +864,6 @@
return new LazyProxyList<${package}.client.${table.Name}, ${table.Name}EJB, ${table.Name}SelectorEJB>( "${table.Name}", query );
}
- private List<${package}.client.${table.Name}> getLazyList( List<EquandaQuery> queries , boolean addOperand, int equandaLimit )
- throws EquandaPersistenceException
- {
- return new LazyProxyList<${package}.client.${table.Name}, ${table.Name}EJB, ${table.Name}SelectorEJB>( "${table.Name}", queries, addOperand, equandaLimit);
- }
-
private List<${package}.client.${table.Name}> convertList( List<DM${table.Name}Bean> org )
throws EquandaPersistenceException
{
Modified: trunk/equanda-server/src/main/java/org/equanda/cache/EquandaBasicCacheLoader.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/cache/EquandaBasicCacheLoader.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/cache/EquandaBasicCacheLoader.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -33,7 +33,7 @@
public Object get( Fqn fqn, Object object )
throws Exception
{
- if ( !cache.containsKey( (String) object ) )
+ if ( !cache.containsKey( object ) )
{
return null;
}
Modified: trunk/equanda-server/src/main/java/org/equanda/translations/TranslatorBean.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/translations/TranslatorBean.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/translations/TranslatorBean.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -24,18 +24,11 @@
package org.equanda.translations;
-import org.equanda.reporting.driver.RecordBatch;
-import org.equanda.translations.TranslatorEJB;
-
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.LocalBinding;
import org.apache.log4j.Logger;
import javax.ejb.*;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import java.sql.*;
-import java.sql.Date;
import java.util.*;
import java.io.Serializable;
@@ -65,7 +58,7 @@
private enum TranslationType
{
LABEL, CAPTION, HELP
- };
+ }
private void initTranslations()
{
Modified: trunk/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/validation/DefaultInstanceImpl.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -38,7 +38,7 @@
public String getDefaultType()
{
- return "VWWH";
+ return " ";
}
}
Modified: trunk/equanda-server/src/main/java/org/equanda/validation/ISOCountry2Letter.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/validation/ISOCountry2Letter.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/validation/ISOCountry2Letter.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -302,11 +302,11 @@
public String getTranslation( String str )
{
Locale[] available = Locale.getAvailableLocales();
- for ( int i = 0; i < available.length; i++ )
+ for ( Locale anAvailable : available )
{
- if ( available[ i ].getCountry().equals( str ) )
+ if ( anAvailable.getCountry().equals( str ) )
{
- return available[ i ].getDisplayCountry();
+ return anAvailable.getDisplayCountry();
}
}
return str;
Modified: trunk/equanda-server/src/main/java/org/equanda/validation/ISOLanguage2Letter.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/validation/ISOLanguage2Letter.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/validation/ISOLanguage2Letter.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -109,11 +109,11 @@
public String getTranslation( String str )
{
Locale[] available = Locale.getAvailableLocales();
- for ( int i = 0 ; i < available.length ; i++ )
+ for ( Locale anAvailable : available )
{
- if ( available[ i ].getLanguage().equals( str ) )
+ if ( anAvailable.getLanguage().equals( str ) )
{
- return available[ i ].getDisplayLanguage();
+ return anAvailable.getDisplayLanguage();
}
}
return str;
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/DatabaseMap.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/DatabaseMap.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/DatabaseMap.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -38,7 +38,7 @@
*
* @param table combination table/finder name
* @return TableHandler for table/finder combination
- * @throws ImportHandlerException
+ * @throws ImportHandlerException oops
*/
TableHandler getTableHandler( String table )
throws ImportHandlerException;
@@ -48,7 +48,7 @@
*
* @param table table name, may contain a finder in it
* @return a FieldMap object
- * @throws ImportHandlerException
+ * @throws ImportHandlerException oops
*/
FieldMap getFieldMap( String table )
throws ImportHandlerException;
@@ -57,9 +57,9 @@
* Get the handler for a specific finder which needs parameters. This only
* selects records.
*
- * @param table
- * @return
- * @throws ImportHandlerException
+ * @param table table+finder definitions
+ * @return TableHandler for finder
+ * @throws ImportHandlerException oops
*/
TableHandler getFinder( String table )
throws ImportHandlerException;
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/FieldHandler.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -28,10 +28,9 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
/**
- * Field handler, adds an extra field in a value object
+ * Field handler, adds an extra field in a proxy object
*
* @author NetRom team
*/
@@ -66,8 +65,8 @@
* Set the given fieldValue in the given valueObject
*
* @param proxyObject import proxy object which needs to have the field set
- * @param fieldValue field value to set, as result from parser, should not be null (in that case
- * the FieldHandler should not be called, as the value was not specified)
+ * @param fieldValue field proxy to set, as result from parser, should not be null (in that case
+ * the FieldHandler should not be called, as the proxy was not specified)
* @throws ImportHandlerException oops
*/
public void setField( Object proxyObject, Object fieldValue )
@@ -81,10 +80,9 @@
value = new ArrayList();
if ( fieldValue instanceof Collection )
{
- Iterator it = ( (Collection) fieldValue ).iterator();
- while ( it.hasNext() )
+ for ( Object o : ( (Collection) fieldValue ) )
{
- value.add( parser.parse( it.next() ) );
+ value.add( parser.parse( o ) );
}
}
else
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMap.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMap.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMap.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -36,7 +36,7 @@
*
* @param name name of the field
* @return FieldHandler which handles setting this field in the ImportObjectValue
- * @throws ImportHandlerException
+ * @throws ImportHandlerException oops
*/
FieldHandler getFieldHandler( DatabaseMap dbMap, String name )
throws ImportHandlerException;
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/FieldMapAdapter.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
/**
* Adapter for FieldMap objects. Only needs initialisation of static variables.
@@ -111,10 +110,9 @@
{
// fieldValue is a collection of collections of fields
ArrayList records = new ArrayList();
- Iterator it = fields.iterator();
- while ( it.hasNext() )
+ for ( Object field : fields )
{
- records.add( ih.ymport( (Collection) it.next() ) );
+ records.add( ih.ymport( (Collection) field ) );
}
fh.setField( valueObject, records );
}
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/ImportParser.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/ImportParser.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/ImportParser.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -64,8 +64,8 @@
/**
* Parse a data line. The line is split up in a series of object. Each of these objects is either a string
- * (simple field value), or a fresh collection (recursive), or null (value not specified), or ImportParser.NULL
- * if the value was the literal "null".
+ * (simple field proxy), or a fresh collection (recursive), or null (proxy not specified), or ImportParser.NULL
+ * if the proxy was the literal "null".
*
* @param line line to be parsed
* @return collection with all the data to be processed
@@ -83,8 +83,8 @@
char[] data = line.toCharArray();
boolean insideString = false; // true when parsing a quoted string
boolean wasInsideString = false; // true when quoted string ended
- boolean haveValue = false; // true when we have a value
- boolean alreadyProcessed = false; // true when the value is already added in the collection
+ boolean haveValue = false; // true when we have a proxy
+ boolean alreadyProcessed = false; // true when the proxy is already added in the collection
for ( int i = 0; i <= data.length ; i++ )
{
char ch;
@@ -353,7 +353,7 @@
// this is implemented as a forward stateful parser, splitting up and recombining on the spot
int bracketCount = 0; // number of brackets which have been opened
boolean wasBracketed = false; // was there a bit with brackets
- boolean done = false; // true when we have a value
+ boolean done = false; // true when we have a proxy
for ( int i = 0; i <= data.length ; i++ )
{
char ch;
@@ -496,8 +496,8 @@
/**
* Parse a string. To be used in field FieldHandler.
*
- * @param value parsed value expected to be a String or NULL
- * @return a string (to be set in a value object)
+ * @param value parsed proxy expected to be a String or NULL
+ * @return a string (to be set in a proxy object)
* @throws ImportHandlerException invalid format
*/
public static String parseString( Object value )
@@ -520,8 +520,8 @@
/**
* Parse a boolean. To be used in FieldHandler.
*
- * @param value parsed value expected to be a one of ("1", "0", "true", "false", "yes", no")
- * @return a boolean (to be set in a value object)
+ * @param value parsed proxy expected to be a one of ("1", "0", "true", "false", "yes", no")
+ * @return a boolean (to be set in a proxy object)
* @throws ImportHandlerException invalid format
*/
public static boolean parseBoolean( Object value )
@@ -553,8 +553,8 @@
/**
* Parse a date. To be used in FieldHandler.
*
- * @param value parsed value expected in the format yyyy-MM-dd, or NULL
- * @return a date (to be set in a value object)
+ * @param value parsed proxy expected in the format yyyy-MM-dd, or NULL
+ * @return a date (to be set in a proxy object)
* @throws ImportHandlerException invalid format
*/
public static Date parseDate( Object value )
@@ -584,8 +584,8 @@
/**
* Parses a timestamp. To be used in FieldHandler.
*
- * @param value parsed value expected in the format yyyy-MM-dd HH:mm:ss, or NULL
- * @return a timestamp (to be set in a value object)
+ * @param value parsed proxy expected in the format yyyy-MM-dd HH:mm:ss, or NULL
+ * @return a timestamp (to be set in a proxy object)
* @throws ImportHandlerException invalid format
*/
public static Timestamp parseTimestamp( Object value )
@@ -631,8 +631,8 @@
/**
* Parse an int. To be used in FieldHandler.
*
- * @param value parsed value, an integer as a string ("1", "22" etc)
- * @return an int (to be set in a value object)
+ * @param value parsed proxy, an integer as a string ("1", "22" etc)
+ * @return an int (to be set in a proxy object)
* @throws ImportHandlerException invalid format
*/
public static int parseInt( Object value )
@@ -660,8 +660,8 @@
/**
* Parse a double. To be used in FieldHandler.
*
- * @param value parsed value, a double as a string ("1.1", "2" etc)
- * @return a date (to be set in a value object)
+ * @param value parsed proxy, a double as a string ("1.1", "2" etc)
+ * @return a date (to be set in a proxy object)
* @throws ImportHandlerException invalid format
*/
public static double parseDouble( Object value )
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/ImportServletUtil.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/ImportServletUtil.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/ImportServletUtil.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -86,7 +86,7 @@
tx.rollback();
}
catch ( Exception exc )
- {}
+ {/*ignore*/}
}
}
}
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/Servlet.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/Servlet.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/Servlet.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -36,7 +36,7 @@
import javolution.lang.TextBuilder;
/**
- * Table handler. Builds a value object from the collection of fields
+ * Table handler. Builds a proxy object from the collection of fields
*
* @author NetRom team
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
Modified: trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java
===================================================================
--- trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java 2007-09-24 12:34:26 UTC (rev 93)
+++ trunk/equanda-server/src/main/java/org/equanda/ymport/TableHandler.java 2007-09-24 15:37:53 UTC (rev 94)
@@ -27,7 +27,7 @@
import org.equanda.persistence.om.EquandaProxy;
/**
- * Table handler. Builds a value object from the collection of fields
+ * Table handler. Builds a proxy object from the collection of fields
*
* @author NetRom team
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
@@ -38,11 +38,11 @@
* There are two possible modes of action depending on the kind of table handler.
*
* Normal table handlers try to update the record if a match exists and create the
- * record if there is no match. These are passed a value object.
+ * record if there is no match. These are passed a proxy object.
*
* Finders are passed a Collection of parameters (or a Collection with
* Collections with parameters). They search for the records using these parameters and
- * return either a single value object or a collection of proxy objects.
+ * return either a single proxy object or a collection of proxy objects.
*
* @param proxyObject proxy to import
* @return proxy or list of proxies
@@ -54,7 +54,7 @@
/**
* Create an empty proxy object for this kind of table
*
- * @return empty value object
+ * @return empty proxy object
*/
EquandaProxy getEmptyObject();
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
