Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[901] trunk
|
From: <tri...@us...> - 2008-12-04 17:32:01
|
Revision: 901
http://equanda.svn.sourceforge.net/equanda/?rev=901&view=rev
Author: triathlon98
Date: 2008-12-04 17:31:43 +0000 (Thu, 04 Dec 2008)
Log Message:
-----------
EQ-299 remove checkstyle errors and warnings
Modified Paths:
--------------
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java
trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
trunk/equanda-generate/src/main/velocity/ejb3/ProxyObjectUpdater.java.vm
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/services/AppModule.java
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
trunk/equanda-test/test-core/src/main/java/org/equanda/test/TestExceptionCodes.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/ActionMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/AutoFieldsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/EquandaRoleMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/LinkableMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/VehicleWithWingsMediator.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/DefaultSample.java
trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/OtherChoices.java
trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/components/Layout.java
trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/pages/Start.java
trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/services/AppModule.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/ymport/ImportTest.java
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -338,7 +338,6 @@
}
public EquandaList<ELTYPE> clone()
- throws CloneNotSupportedException
{
EquandaList<ELTYPE> clone = new EquandaList<ELTYPE>();
clone.proxySetterUsed = proxySetterUsed;
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectSelector.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -44,18 +44,18 @@
public static final String FILTER_PARAMETER_PREFIX = "equandaFilter";
private ObjectSelector() {}
-
- protected static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery )
+
+ public static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery )
{
return getEquandaQuery( em, equandaQuery, null, true );
}
- protected static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery, String queryString )
+ public static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery, String queryString )
{
return getEquandaQuery( em, equandaQuery, queryString, true );
}
- protected static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery, String queryString,
+ public static Query getEquandaQuery( EntityManager em, EquandaQuery equandaQuery, String queryString,
boolean setLimits )
{
if ( queryString == null ) queryString = equandaQuery.getQueryString();
@@ -79,7 +79,7 @@
* @param query String representation of query
* @return object name
*/
- protected static String getQueryObject( String query )
+ public static String getQueryObject( String query )
{
String obj;
if ( query.toUpperCase().startsWith( "SELECT " ) )
@@ -243,7 +243,7 @@
* @param fieldName new field for use with ORDER BY
* @return the new calculated query
*/
- protected static String setOrderBy( String queryStr, String fieldName )
+ public static String setOrderBy( String queryStr, String fieldName )
{
if ( fieldName == null || fieldName.length() == 0 ) return queryStr;
TextBuilder builder = TextBuilder.newInstance();
@@ -277,7 +277,7 @@
* @param wherePart stuff which needs to be inserted in the "where" part of the query
* @return the new calculated query
*/
- protected static String setFilter( EquandaQuery equandaQuery, String queryStr, String name, String fromPart,
+ public static String setFilter( EquandaQuery equandaQuery, String queryStr, String name, String fromPart,
String wherePart )
{
String value = SelectorsState.getFilter( name );
Modified: trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-generate/src/main/velocity/ejb3/DMObjectSelector.java.vm 2008-12-04 17:31:43 UTC (rev 901)
@@ -40,6 +40,7 @@
import org.equanda.persistence.query.EquandaQuery;
import org.equanda.persistence.query.EquandaQueryImpl;
import org.equanda.persistence.Uoid;
+import org.equanda.persistence.ObjectSelector;
import org.equanda.persistence.SelectorsState;
import javax.persistence.EntityManager;
import javax.persistence.Query;
@@ -52,7 +53,6 @@
* $table.Description
*/
public class DM${table.Name}Selector
- extends org.equanda.persistence.ObjectSelector
{
#macro( selectQueryParameters $select )
@@ -145,7 +145,6 @@
{
public int compare(DM${table.Name}Bean obj1, DM${table.Name}Bean obj2)
{
-
int ret=0;
#foreach( $order in $select.OrderFields )
if ( ret == 0 )
@@ -237,10 +236,10 @@
String sorting = SelectorsState.getSorting( "$table.Name" );
Query query;
String queryString = equandaQuery.getQueryString();
- queryString = setOrderBy( queryString, sorting );
+ queryString = ObjectSelector.setOrderBy( queryString, sorting );
queryString = setFilters( equandaQuery, queryString );
- query = getEquandaQuery( em, equandaQuery, queryString );
+ query = ObjectSelector.getEquandaQuery( em, equandaQuery, queryString );
return (List<DM${table.Name}Bean>) query.getResultList();
} finally { equandaQuery.clearExtra(); }
}
@@ -251,7 +250,7 @@
{
EquandaQuery query = EquandaGlobal.getQuery( "${table.Name}.equanda${field.Name}Unique" );
query.setParameter( "${field.VarName}", ${field.VarName} );
- Query q = getEquandaQuery( em, query );
+ Query q = ObjectSelector.getEquandaQuery( em, query );
return (Long)q.getResultList().get( 0 );
}
#end
@@ -270,7 +269,7 @@
query = EquandaGlobal.getQuery( "${table.Name}.equanda${field.Name}UniqueNull" );
}
query.setParameter( "${field.VarName}", ${field.VarName} );
- Query q = getEquandaQuery( em, query );
+ Query q = ObjectSelector.getEquandaQuery( em, query );
return (Long)q.getResultList().get( 0 );
}
#end
@@ -290,7 +289,7 @@
public static String setFilters( EquandaQuery equandaQuery, String queryString )
{
#foreach( $filter in $table.DataFilters )
- queryString = setFilter( equandaQuery, queryString, "$filter.Name", "$filter.FilterQuery.From", "$filter.FilterQuery.Where" );
+ queryString = ObjectSelector.setFilter( equandaQuery, queryString, "$filter.Name", "$filter.FilterQuery.From", "$filter.FilterQuery.Where" );
#end
queryString = org.equanda.persistence.ObjectSelector.addFilter( queryString, "", SelectorsState.getFilter( "equanda${table.Name}" ) );
return queryString;
@@ -310,9 +309,9 @@
//em.flush();
Query query;
- String queryString = getRunCountQueryString( equandaQuery );
+ String queryString = ObjectSelector.getRunCountQueryString( equandaQuery );
queryString = setFilters( equandaQuery, queryString );
- query = getEquandaQuery( em, equandaQuery, queryString, false );
+ query = ObjectSelector.getEquandaQuery( em, equandaQuery, queryString, false );
Map<String, Object> parameters = equandaQuery.getParameters();
for ( String name : parameters.keySet() ) query.setParameter( name, parameters.get( name ) );
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxy.java.vm 2008-12-04 17:31:43 UTC (rev 901)
@@ -299,7 +299,7 @@
if ( !objectEquals( status, proxy.equandaStatus ) )
{
proxy.equandaStatus = status;
- proxy._modifiedEquandaStatus = true;
+ proxy.equandaModifiedEquandaStatus = true;
}
}
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectProxyState.java.vm 2008-12-04 17:31:43 UTC (rev 901)
@@ -98,7 +98,7 @@
public boolean isModified( boolean typeFieldsOnly )
{
- if ( _modifiedEquandaStatus ) return true;
+ if ( equandaModifiedEquandaStatus ) return true;
#foreach( $field in $table.FieldsNotInternalAndNotCalculated )
if ( typeFieldsOnly )
{
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ObjectSelectorBean.java.vm 2008-12-04 17:31:43 UTC (rev 901)
@@ -45,6 +45,7 @@
import org.equanda.persistence.EquandaPersistenceException;
import org.equanda.persistence.Uoid;
import org.equanda.persistence.query.EquandaQueryImpl;
+import org.equanda.persistence.ObjectSelector;
import org.equanda.persistence.SelectorsState;
import java.util.ArrayList;
@@ -278,7 +279,7 @@
public long equandaRunUpdateQuery( EquandaQuery query )
throws EquandaPersistenceException
{
- return DM${table.Name}Selector.runUpdateQuery( entityManager, query );
+ return ObjectSelector.runUpdateQuery( entityManager, query );
}
public ${package}.client.${table.Name} selectEquandaSingle( EquandaQuery query )
Modified: trunk/equanda-generate/src/main/velocity/ejb3/ProxyObjectUpdater.java.vm
===================================================================
--- trunk/equanda-generate/src/main/velocity/ejb3/ProxyObjectUpdater.java.vm 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-generate/src/main/velocity/ejb3/ProxyObjectUpdater.java.vm 2008-12-04 17:31:43 UTC (rev 901)
@@ -71,7 +71,7 @@
String errorField = "";
try
{
- if ( proxy._modifiedEquandaStatus )
+ if ( proxy.equandaModifiedEquandaStatus )
{
errorField = "EquandaStatus";
if ( !objectEquals( proxy.equandaStatus, bean.getEquandaStatus() ) )
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml 2008-12-04 17:31:43 UTC (rev 901)
@@ -35,6 +35,7 @@
<!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
+ <!-- disabled because we allow all on one line if it fits
<module name="LeftCurly">
<property name="severity" value="info"/>
<property name="option" value="nl"/>
@@ -43,6 +44,7 @@
<property name="severity" value="info"/>
<property name="option" value="alone"/>
</module>
+ -->
<!--<module name="EmptyBlock"/>-->
<module name="AvoidNestedBlocks"/>
<!--<module name="NeedBraces"/> no braces is allowed when on same line -->
@@ -89,7 +91,9 @@
<!--<module name="AvoidStarImport"/>-->
<module name="IllegalImport"/>
<module name="RedundantImport"/>
- <module name="UnusedImports"/>
+ <module name="UnusedImports">
+ <property name="severity" value="info"/>
+ </module>
<module name="ImportOrder">
<property name="groups" value="be,org"/>
<property name="severity" value="info"/>
@@ -102,12 +106,14 @@
<property name="severity" value="info"/>
<property name="max" value="120"/>
</module>
+ <!--
<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>
@@ -169,7 +175,9 @@
<!--<module name="AvoidInlineConditionals"/>-->
<module name="CovariantEquals"/>
<module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
+ <module name="EmptyStatement">
+ <property name="severity" value="info"/>
+ </module>
<module name="EqualsHashCode"/>
<!--<module name="FinalLocalVariable"/>-->
<module name="HiddenField">
@@ -188,7 +196,9 @@
<property name="severity" value="warning"/>
</module>
<!--<module name="MagicNumber"/>-->
- <module name="MissingSwitchDefault"/>
+ <module name="MissingSwitchDefault">
+ <property name="severity" value="info"/>
+ </module>
<module name="ModifiedControlVariable"/>
<!--<module name="RedundantThrows"/>-->
<module name="SimplifyBooleanExpression"/>
@@ -196,7 +206,7 @@
<module name="StringLiteralEquality"/>
<!--<module name="NestedIfDepth"/>-->
<!--<module name="NestedTryDepth"/>-->
- <module name="SuperClone"/>
+ <!--<module name="SuperClone"/>-->
<module name="SuperFinalize"/>
<!--<module name="IllegalCatch"/>-->
<!--<module name="IllegalThrows"/>-->
@@ -205,7 +215,9 @@
<!--<module name="ReturnCount"/>-->
<!--<module name="IllegalType"/>-->
<!--<module name="DeclarationOrder"/>-->
- <module name="ParameterAssignment"/>
+ <module name="ParameterAssignment">
+ <property name="severity" value="info"/>
+ </module>
<module name="ExplicitInitialization">
<property name="severity" value="info"/>
</module>
@@ -224,7 +236,7 @@
<property name="protectedAllowed" value="true"/>
</module>
<module name="FinalClass"/>
- <module name="InterfaceIsType"/>
+ <!--<module name="InterfaceIsType"/>-->
<module name="HideUtilityClassConstructor"/>
<!--<module name="DesignForExtension"/>-->
<!--<module name="MutableException"/>-->
@@ -233,6 +245,7 @@
<!-- misc, see http://checkstyle.sourceforge.net/config_misc.html -->
<module name="GenericIllegalRegexp">
+ <property name="severity" value="info"/>
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
</module>
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/services/AppModule.java
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/services/AppModule.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/gui/src/main/java/services/AppModule.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -55,8 +55,10 @@
* This module is automatically included as part of the Tapestry IoC Registry, it's a good place to configure and extend
* Tapestry, or to place your own service definitions.
*/
-public class AppModule
+public final class AppModule
{
+ private AppModule() {}
+
/**
* Bind extra services.
*
@@ -112,7 +114,7 @@
* @param log log
* @return request filter
*/
- public RequestFilter buildTimingFilter( final Logger log )
+ public static RequestFilter buildTimingFilter( final Logger log )
{
return new RequestFilter()
{
@@ -148,7 +150,7 @@
* @param persistentLocale locale to allow chaning to user preference
* @return request filter
*/
- public RequestFilter buildLoginFilter( final Logger log,
+ public static RequestFilter buildLoginFilter( final Logger log,
final RequestGlobals requestGlobals,
final PersistentLocale persistentLocale,
final LoginInfoService loginInfoService )
@@ -211,7 +213,7 @@
* @param timingFilter filter info
* @param loginFilter filter info
*/
- public void contributeRequestHandler( OrderedConfiguration<RequestFilter> configuration,
+ public static void contributeRequestHandler( OrderedConfiguration<RequestFilter> configuration,
@InjectService( "TimingFilter" )RequestFilter timingFilter,
@InjectService( "LoginFilter" )RequestFilter loginFilter )
{
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2008-12-04 17:31:43 UTC (rev 901)
@@ -85,6 +85,21 @@
<inherited>false</inherited>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/checkstyle.xml</configLocation>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<executions>
Modified: trunk/equanda-test/test-core/src/main/java/org/equanda/test/TestExceptionCodes.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/TestExceptionCodes.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/TestExceptionCodes.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -31,17 +31,17 @@
*/
public interface TestExceptionCodes
{
- public static int EPE_PROBLEM_IN_AUTOPASSPORT = 100001;
- public static int EPE_PROBLEM_IN_AUTOMULTIPLEAUTO = 100002;
- public static int EPE_PROBLEM_IN_AUTOMULTIPLEPASSPORT = 100003;
- public static int EPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS = 100004;
- public static int EPE_RESULTNAME_CANNOT_BE_NULL = 100005;
- public static int EPE_MERGENAME_MUST_EXIST_CANNOT_BE_NULL = 100006;
- public static int EPE_ROLE_NOT_FOUND = 100007;
+ static int EPE_PROBLEM_IN_AUTOPASSPORT = 100001;
+ static int EPE_PROBLEM_IN_AUTOMULTIPLEAUTO = 100002;
+ static int EPE_PROBLEM_IN_AUTOMULTIPLEPASSPORT = 100003;
+ static int EPE_SAME_IDENTIFIER_USED_FOR_EDIT_AND_RUN_ACCESS = 100004;
+ static int EPE_RESULTNAME_CANNOT_BE_NULL = 100005;
+ static int EPE_MERGENAME_MUST_EXIST_CANNOT_BE_NULL = 100006;
+ static int EPE_ROLE_NOT_FOUND = 100007;
- public static int ECV_NUMBER_NOT_MULTIPLE_OF_100 = 110001;
- public static int ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD = 110002;
- public static int ECV_REMOVE2_NOT_ALOWED_STRING_TO_REMOVE = 110003;
+ static int ECV_NUMBER_NOT_MULTIPLE_OF_100 = 110001;
+ static int ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD = 110002;
+ static int ECV_REMOVE2_NOT_ALOWED_STRING_TO_REMOVE = 110003;
- public static int EDE_TOO_SLOW_FOR_A_VEHICLE_WITH_WINGS = 140001;
+ static int EDE_TOO_SLOW_FOR_A_VEHICLE_WITH_WINGS = 140001;
}
Modified: trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/ActionMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/ActionMediator.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/ActionMediator.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -65,7 +65,7 @@
{
try
{
- for ( int i = 0 ; i < 10 ; i++ )
+ for ( int i = 0; i < 10 ; i++ )
{
Thread.sleep( 1000 );
System.out.println( i );
Modified: trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/AutoFieldsMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/AutoFieldsMediator.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/AutoFieldsMediator.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -60,7 +60,7 @@
}
catch ( Exception e )
{
- throw new EquandaPersistenceException( EPE_PROBLEM_IN_AUTOMULTIPLEAUTO, e);
+ throw new EquandaPersistenceException( EPE_PROBLEM_IN_AUTOMULTIPLEAUTO, e );
}
array.add( obj );
return array;
Modified: trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/EquandaRoleMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/EquandaRoleMediator.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/EquandaRoleMediator.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -25,15 +25,9 @@
package org.equanda.test.dm.server;
import org.equanda.persistence.EquandaPersistenceException;
-import org.equanda.test.dm.client.*;
import org.equanda.test.TestExceptionCodes;
-import org.equanda.validation.EditableRights;
-import org.equanda.validation.RunnableRights;
-import java.util.Collection;
-import java.util.ArrayList;
-
/**
* Mediator for EquandaRole. Implementation for functions mergeRights & mergeRestrictions
*
@@ -58,7 +52,8 @@
}
/*
- private void mixRights( Collection<EquandaRight> col1, Collection<EquandaRight> col2, Collection<EquandaRight> result, boolean restrict )
+ private void mixRights( Collection<EquandaRight> col1, Collection<EquandaRight> col2,
+ Collection<EquandaRight> result, boolean restrict )
throws EquandaPersistenceException
{
for ( EquandaRight right1 : col1 )
Modified: trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/LinkableMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/LinkableMediator.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/LinkableMediator.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -1,14 +1,38 @@
+/**
+ * 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.test.dm.server;
-import org.equanda.persistence.Uoid;
import org.equanda.persistence.EquandaConstraintViolation;
import org.equanda.persistence.EquandaPersistenceException;
+import org.equanda.persistence.Uoid;
+import static org.equanda.test.TestExceptionCodes.ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD;
import org.equanda.test.dm.server.pm.DMRemove2Bean;
import org.equanda.test.dm.server.pm.DMRemove2Selector;
-import static org.equanda.test.TestExceptionCodes.ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD;
/**
- * Description!!!
+ * Mediator for "Linkable"
*
* @author <a href="mailto:an...@pa...">Andrei Chiritescu</a>
*/
@@ -58,7 +82,7 @@
if ( REMOVE2_NOT_ALOWED_STRING_TO_ADD.equals( obj.getTheString() ) )
{
throw new EquandaConstraintViolation( ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD,
- REMOVE2_NOT_ALOWED_STRING_TO_ADD );
+ REMOVE2_NOT_ALOWED_STRING_TO_ADD );
}
}
}
@@ -72,7 +96,7 @@
if ( REMOVE2_NOT_ALOWED_STRING_TO_REMOVE.equals( obj.getTheString() ) )
{
throw new EquandaConstraintViolation( ECV_REMOVE2_NOT_ALOWED_STRING_TO_ADD,
- REMOVE2_NOT_ALOWED_STRING_TO_ADD );
+ REMOVE2_NOT_ALOWED_STRING_TO_ADD );
}
}
}
Modified: trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/VehicleWithWingsMediator.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/VehicleWithWingsMediator.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/dm/server/VehicleWithWingsMediator.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -46,11 +46,11 @@
}
try
{
- super.setSpeed( speed );
- }
- catch (Exception e)
- {
- throw new EquandaConstraintViolation(e);
- }
+ super.setSpeed( speed );
+ }
+ catch ( Exception e )
+ {
+ throw new EquandaConstraintViolation( e );
+ }
}
}
Modified: trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/DefaultSample.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/DefaultSample.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/DefaultSample.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -38,4 +38,4 @@
{
return 1111;
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/OtherChoices.java
===================================================================
--- trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/OtherChoices.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-core/src/main/java/org/equanda/test/validator/OtherChoices.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -26,8 +26,8 @@
import org.equanda.validation.EnumerableChoiceAdapter;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.ArrayList;
/**
Modified: trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/components/Layout.java
===================================================================
--- trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/components/Layout.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/components/Layout.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -38,7 +38,7 @@
public class Layout
{
@Inject
- @Path("context:css/style.css")
+ @Path( "context:css/style.css" )
private Asset style;
@Inject
Modified: trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/pages/Start.java
===================================================================
--- trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/pages/Start.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/pages/Start.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -26,13 +26,11 @@
import java.util.Date;
-/**
- * Start page of application ca-t5gui.
- */
+/** Start page of application ca-t5gui. */
public class Start
{
- public Date getCurrentTime()
- {
- return new Date();
- }
-}
\ No newline at end of file
+ public Date getCurrentTime()
+ {
+ return new Date();
+ }
+}
Modified: trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/services/AppModule.java
===================================================================
--- trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/services/AppModule.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-t5-gui/src/main/java/org/equanda/test/gui/services/AppModule.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -25,14 +25,10 @@
package org.equanda.test.gui.services;
import javassist.runtime.Desc;
-import org.apache.tapestry5.Translator;
-import org.apache.tapestry5.ioc.Configuration;
import org.apache.tapestry5.ioc.MappedConfiguration;
import org.apache.tapestry5.ioc.OrderedConfiguration;
import org.apache.tapestry5.ioc.ServiceBinder;
import org.apache.tapestry5.ioc.annotations.InjectService;
-import org.apache.tapestry5.ioc.services.Coercion;
-import org.apache.tapestry5.ioc.services.CoercionTuple;
import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.RequestFilter;
import org.apache.tapestry5.services.RequestHandler;
@@ -45,8 +41,10 @@
* This module is automatically included as part of the Tapestry IoC Registry, it's a good place to configure and extend
* Tapestry, or to place your own service definitions.
*/
-public class AppModule
+public final class AppModule
{
+ private AppModule() {}
+
/**
* Bind extra services.
*
@@ -102,7 +100,7 @@
* @param log log
* @return request filter
*/
- public RequestFilter buildTimingFilter( final Logger log )
+ public static RequestFilter buildTimingFilter( final Logger log )
{
return new RequestFilter()
{
@@ -136,7 +134,7 @@
* @param configuration configuration to add to
* @param filter filter info
*/
- public void contributeRequestHandler( OrderedConfiguration<RequestFilter> configuration,
+ public static void contributeRequestHandler( OrderedConfiguration<RequestFilter> configuration,
@InjectService( "TimingFilter" )
RequestFilter filter )
{
Modified: 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/export/ExportTest.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/export/ExportTest.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -242,7 +242,7 @@
}
/*
- * exports the EQUANDA_TYPE of a car
+ * exports the EquandaType of a car
* checks the results
*/
public void testExportEquandaType()
@@ -256,7 +256,7 @@
IniFile ini = new IniFile();
ini.addSection( "Vehicle" );
ini.addValue( "Vehicle", "file", EXPORT_OUTPUT_FILENAME_VEHICLE );
- ini.addValue( "Vehicle", "1", "EQUANDA_TYPE" );
+ ini.addValue( "Vehicle", "1", "EquandaType" );
// export car
exp.export( veh.getEquanda(), veh.getEquanda(), ini, null, true, null );
Modified: trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java
===================================================================
--- trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java 2008-12-04 15:25:02 UTC (rev 900)
+++ trunk/equanda-test/test-test/src/test/java/org/equanda/test/ymport/ImportTest.java 2008-12-04 17:31:43 UTC (rev 901)
@@ -280,7 +280,7 @@
String name = "Boeing";
int radius = 10;
String lines[] = {
- ":table:Vehicle:EQUANDA_TYPE,Radius,Name",
+ ":table:Vehicle:EquandaType,Radius,Name",
ImportUtil.quote( "AIRP" ) + ',' + radius + ',' + ImportUtil.quote( name )
};
assertNull( ImportUtil.importStrings( lines, URL, getImportCredentials() ) );
@@ -325,7 +325,7 @@
String name = "Boeing3";
int radius = 10;
String lines[] = {
- ":table:VehicleWithWheels:EQUANDA_TYPE,Radius,Name",
+ ":table:VehicleWithWheels:EquandaType,Radius,Name",
ImportUtil.quote( "AIRP" ) + ',' + radius + ',' + ImportUtil.quote( name )
};
assertNull( ImportUtil.importStrings( lines, URL, getImportCredentials() ) );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
