Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[895] trunk
|
From: <tri...@us...> - 2008-12-03 17:17:36
|
Revision: 895
http://equanda.svn.sourceforge.net/equanda/?rev=895&view=rev
Author: triathlon98
Date: 2008-12-03 17:17:32 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
EQ-299 remove checkstyle errors and warnings
Modified Paths:
--------------
trunk/config/checkstyle.xml
trunk/equanda-client/src/main/java/org/equanda/client/ImportClient.java
trunk/equanda-client/src/main/java/org/equanda/export/Export.java
trunk/equanda-client/src/main/java/org/equanda/export/ExportInfo.java
trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EJBUtil.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaDowngradeException.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaFieldBean.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java
trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceError.java
trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java
trunk/equanda-client/src/main/java/org/equanda/persistence/Uoid.java
trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java
trunk/equanda-client/src/main/java/org/equanda/translations/Parser.java
trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJB.java
trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJBUtil.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/AbstractSelect.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Group.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/IncludeData.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Mapping.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Page.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Parser.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Select.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Table.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Type.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/BooleanTest.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/ListFilter.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/ObjectGetter.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/TemplateUtil.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/TransformationUtil.java
trunk/equanda-dm/src/main/java/org/equanda/domain/xml/transform/RootTable.java
Modified: trunk/config/checkstyle.xml
===================================================================
--- trunk/config/checkstyle.xml 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/config/checkstyle.xml 2008-12-03 17:17:32 UTC (rev 895)
@@ -206,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"/>-->
Modified: trunk/equanda-client/src/main/java/org/equanda/client/ImportClient.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/client/ImportClient.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/client/ImportClient.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -86,4 +86,4 @@
}
return body;
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/export/Export.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/export/Export.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -24,14 +24,14 @@
package org.equanda.export;
-import org.equanda.persistence.Uoid;
+import javolution.lang.TextBuilder;
+import org.apache.log4j.Logger;
import org.equanda.persistence.EquandaProxy;
+import org.equanda.persistence.Uoid;
import org.equanda.util.Base64;
import org.equanda.util.IniFile;
import org.equanda.util.StringSplitter;
import org.equanda.util.StringUtil;
-import javolution.lang.TextBuilder;
-import org.apache.log4j.Logger;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
@@ -53,20 +53,14 @@
{
private static final Logger log = Logger.getLogger( Export.class );
- /**
- * format for outputting dates
- */
- public static final DateTimeFormatter dateFormat = DateTimeFormat.forPattern( "yyyy-MM-dd" );
- /**
- * format for outputting timestamps
- */
- public static final DateTimeFormatter timeFormat = DateTimeFormat.forPattern( "yyyy-MM-dd HH:mm:ss" );
+ /** format for outputting dates */
+ public static final DateTimeFormatter DATE_FORMAT = DateTimeFormat.forPattern( "yyyy-MM-dd" );
+ /** format for outputting timestamps */
+ public static final DateTimeFormatter TIME_FORMAT = DateTimeFormat.forPattern( "yyyy-MM-dd HH:mm:ss" );
- private static final ExportInfo uoidFieldInfo = new ExportInfo( "", "", "Id" );
+ private static final ExportInfo UOID_FIELD_INFO = new ExportInfo( "", "", "Id" );
- /**
- * directory for output file
- */
+ /** directory for output file */
private String dir = "";
public void export( Collection col, IniFile ini )
@@ -169,7 +163,7 @@
if ( !( refForName instanceof ExportEvaluator ) )
{
throw new ExportException( "refForName should be a EquandaProxy or ExportEvaluator object but is a "
- + refForName.getClass().getName() );
+ + refForName.getClass().getName() );
}
ExportEvaluator exportEvaluator = (ExportEvaluator) refForName;
String tableName;
@@ -285,11 +279,11 @@
}
else if ( value instanceof Date )
{
- tbLine.append( dateFormat.print( ( (Date) value ).getTime() ) );
+ tbLine.append( DATE_FORMAT.print( ( (Date) value ).getTime() ) );
}
else if ( value instanceof Timestamp )
{
- tbLine.append( timeFormat.print( ( (Timestamp) value ).getTime() ) );
+ tbLine.append( TIME_FORMAT.print( ( (Timestamp) value ).getTime() ) );
}
else if ( value instanceof Integer || value instanceof Boolean )
{
@@ -336,7 +330,7 @@
catch ( ClassCastException e )
{
throw new ExportException( "Object form Map (" + tableName + '/' + fieldName +
- ") is not an ExportInfo ", e );
+ ") is not an ExportInfo ", e );
}
}
}
@@ -357,7 +351,7 @@
if ( fieldInfo == null )
{
objValue = objToExport;
- fieldInfo = uoidFieldInfo;
+ fieldInfo = UOID_FIELD_INFO;
}
else
{
@@ -391,10 +385,10 @@
throw new ExportException( "Cannot find method selectId in " + objClass.getName(), e );
}
- Object[] param_v = { objToExport };
+ Object[] paramV = { objToExport };
try
{
- objValue = method.invoke( objSelEJB, param_v );
+ objValue = method.invoke( objSelEJB, paramV );
}
catch ( Exception e )
{
@@ -449,19 +443,23 @@
for ( int i = 0; i < fileName.length() ; i++ )
{
if ( ( fileName.charAt( i ) == '$' ) && ( i != fileName.length() - 1 ) &&
- ( fileName.charAt( i + 1 ) == '{' ) )
+ ( fileName.charAt( i + 1 ) == '{' ) )
{
if ( !isVar )
{
isVar = true;
- var.setLength( 0 );// = new TextBuilder();
- i++;
+ var.setLength( 0 );
}
else
{
throw new ExportException( "Nested variable use not allowed" );
}
}
+ else if ( ( fileName.charAt( i ) == '{' ) && ( i > 0 ) && isVar &&
+ ( fileName.charAt( i - 1 ) == '$' ) )
+ {
+ // ok, skip
+ }
else
{
if ( fileName.charAt( i ) == '}' )
Modified: trunk/equanda-client/src/main/java/org/equanda/export/ExportInfo.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/export/ExportInfo.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/export/ExportInfo.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -56,4 +56,4 @@
{
return fieldToExport;
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/CheckRulesState.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -31,7 +31,7 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class CheckRulesState
+public final class CheckRulesState
{
public static final String RULES_CHECKS_STATE_CONTEXT = "equanda-CheckRulesStateContext";
@@ -43,8 +43,9 @@
}
};
+ private CheckRulesState() {}
+
public static boolean getCheckRules() { return (Boolean) state.get(); }
public static void setCheckRules( boolean value ) { state.set( Boolean.valueOf( value ) ); }
-
-}
\ No newline at end of file
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EJBUtil.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EJBUtil.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EJBUtil.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -31,8 +31,10 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class EJBUtil
+public final class EJBUtil
{
+ private EJBUtil() {}
+
public static <T> T lookup( String jndiName, Class<T> narrowTo )
throws javax.naming.NamingException
{
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaDowngradeException.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaDowngradeException.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaDowngradeException.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -35,7 +35,7 @@
public class EquandaDowngradeException
extends EquandaConstraintViolation
{
- public static String DEFAULT_MESSAGE = "DOWNGRADE EXCEPTION";
+ public static final String DEFAULT_MESSAGE = "DOWNGRADE EXCEPTION";
public EquandaDowngradeException() {}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaEJB.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -45,6 +45,6 @@
String getEquandaName();
String getEquandaStatus();
void setEquandaStatus( String status );
-
+
void remove();
}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaFieldBean.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaFieldBean.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaFieldBean.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -26,8 +26,8 @@
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
+import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
-import javax.persistence.MappedSuperclass;
import java.sql.Timestamp;
/**
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaImportProxy.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -39,7 +39,7 @@
String getEquandaType();
- public ID getId();
+ ID getId();
java.sql.Timestamp getEquandaModificationDate();
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-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaList.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -47,7 +47,7 @@
private Set<ElementWrapper> removeSet = new HashSet<ElementWrapper>();
// considered when no objects in list or remove list (otherwise we cannot know if the object was modified or not)
- protected boolean proxySetterUsed = false;
+ protected boolean proxySetterUsed;
public EquandaList()
{
@@ -241,9 +241,9 @@
{
if ( null == elem ) return -1;
int size = list.size();
- for ( int i = size - 1; i >= 0 ; i-- )
- {
- if ( equalsElem( elem, get( i ) ) ) return i;
+ for ( int i = size - 1; i >= 0 ; i-- )
+ {
+ if ( equalsElem( elem, get( i ) ) ) return i;
}
return -1;
}
@@ -318,26 +318,27 @@
private ElementWrapper buildElementWrapper( ELTYPE elem, boolean replaceElem )
{
if ( null == elem ) return null;
- for ( ElementWrapper ew : list )
+ for ( ElementWrapper ew : list )
+ {
+ if ( equalsElem( elem, ew.element ) )
{
- if ( equalsElem( elem, ew.element ) )
- {
- if ( replaceElem ) ew.element = elem;
- return ew;
- }
+ if ( replaceElem ) ew.element = elem;
+ return ew;
}
- for ( ElementWrapper ew : removeSet )
+ }
+ for ( ElementWrapper ew : removeSet )
+ {
+ if ( equalsElem( elem, ew.element ) )
{
- if ( equalsElem( elem, ew.element ) )
- {
- if ( replaceElem ) ew.element = elem;
- return ew;
- }
+ if ( replaceElem ) ew.element = elem;
+ return ew;
}
- return new ElementWrapper( elem, false );
+ }
+ return new ElementWrapper( elem, false );
}
public EquandaList<ELTYPE> clone()
+ throws CloneNotSupportedException
{
EquandaList<ELTYPE> clone = new EquandaList<ELTYPE>();
clone.proxySetterUsed = proxySetterUsed;
@@ -351,7 +352,8 @@
/**
* First tries to see if the objects have id and if so it compares it; otherwise it does the normal equals();
- * This is needed because for proxies the equals method now also compares the modified state and equandaVersion - which is not good for this case;
+ * This is needed because for proxies the equals method now also compares the modified state and equandaVersion -
+ * which is not good for this case;
*
* @param o1 - first object
* @param o2 - second object
@@ -372,8 +374,8 @@
class ElementWrapper
implements Serializable
{
- ELTYPE element;
- boolean isOriginal;
+ private ELTYPE element;
+ private boolean isOriginal;
ElementWrapper() {}
@@ -512,4 +514,4 @@
tb.append( ']' );
return tb.toString();
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaMediatorRoot.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -41,24 +41,37 @@
// initialise mediator object
public void init( ENTITY entity, BEAN object, EntityManager em )
{
- this.entity=entity;
- this.object=object;
+ this.entity = entity;
+ this.object = object;
this.em = em;
}
+
public ENTITY getEquandaEntity() { return entity; }
// allow retrieval of the base entity information
- public Uoid getId() { return entity.getId(); }
- public String getEquandaType() { String type=entity.getEquandaType(); if (type.length()>4) type=type.substring(0,4); return type; }
+ public Uoid getId()
+ { return entity.getId(); }
+
+ public String getEquandaType()
+ {
+ String type = entity.getEquandaType();
+ if ( type.length() > 4 ) type = type.substring( 0, 4 );
+ return type;
+ }
+
public java.sql.Timestamp getEquandaModificationDate() { return entity.getEquandaModificationDate(); }
+
public java.sql.Timestamp getEquandaCreationDate() { return entity.getEquandaCreationDate(); }
+
public long getEquandaVersion() { return entity.getEquandaVersion(); }
+
public String getEquandaStatus()
{
String status = entity.getEquandaStatus();
if ( status != null && status.length() > 1 ) status = status.substring( 0, 1 );
return status;
}
+
public void setEquandaStatus( String status ) { entity.setEquandaStatus( status ); }
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceError.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceError.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/EquandaPersistenceError.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -66,4 +66,4 @@
return super.getMessage();
}
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/ObjectType.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -93,4 +93,4 @@
* @return arracy of parent types
*/
String[] getParentTypes();
-}
\ No newline at end of file
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/Uoid.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/Uoid.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/Uoid.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -95,4 +95,4 @@
if ( id == null ) return 0;
return id.hashCode();
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/persistence/query/EquandaQueryImpl.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -145,9 +145,9 @@
return typeFilter;
}
- public EquandaQuery setTypeFilter( ObjectType typeFilter_ )
+ public EquandaQuery setTypeFilter( ObjectType newValue )
{
- this.typeFilter = typeFilter_;
+ this.typeFilter = newValue;
return this;
}
Modified: trunk/equanda-client/src/main/java/org/equanda/translations/Parser.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/translations/Parser.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/translations/Parser.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -27,7 +27,6 @@
import org.apache.log4j.Logger;
import java.io.*;
-
import java.util.TreeMap;
/**
@@ -160,7 +159,7 @@
String keyStr;
String contextStr = null;
String value = line.substring( KEY_SECTION.length() );
- String splitted[] = value.split( "/" );
+ String[] splitted = value.split( "/" );
if ( splitted.length == 2 )
{
keyStr = splitted[ 0 ];
@@ -179,7 +178,7 @@
key.setContext( contextStr );
for ( String language : languages )
{
- TreeMap<Key,Translation> currentLanguageMap = maps.get( language );
+ TreeMap<Key, Translation> currentLanguageMap = maps.get( language );
currentLanguageMap.put( key, new Translation() );
}
}
Modified: trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJB.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJB.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJB.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -24,7 +24,6 @@
package org.equanda.translations;
-import javax.ejb.Local;
import javax.ejb.Remote;
import java.util.List;
@@ -36,7 +35,7 @@
@Remote
public interface TranslatorEJB
{
- public String translate( String language, String message, List<String> contexts );
+ String translate( String language, String message, List<String> contexts );
void remove();
}
Modified: trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJBUtil.java
===================================================================
--- trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJBUtil.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-client/src/main/java/org/equanda/translations/TranslatorEJBUtil.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -21,6 +21,7 @@
* 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.translations;
import org.equanda.persistence.EJBUtil;
@@ -32,8 +33,10 @@
*
* @author Florin
*/
-public class TranslatorEJBUtil
+public final class TranslatorEJBUtil
{
+ private TranslatorEJBUtil() {}
+
public static TranslatorEJB get()
{
try
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/AbstractSelect.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/AbstractSelect.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/AbstractSelect.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -40,7 +40,7 @@
public abstract class AbstractSelect
{
@XStreamOmitField
- private int numberOfParameters = 0;
+ private int numberOfParameters;
@XStreamOmitField
protected String calculatedQuery;
@XStreamOmitField
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Field.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -1455,4 +1455,4 @@
}
return false;
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Group.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Group.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Group.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -308,4 +308,4 @@
}
return tb.toString();
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/IncludeData.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/IncludeData.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/IncludeData.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -81,4 +81,4 @@
}
public Hide getHide() { return hide; }
-}
\ No newline at end of file
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Mapping.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Mapping.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Mapping.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -53,9 +53,9 @@
private void err( Parser parser, String msg, Table table, Field field )
{
- String err =msg;
- if ( null != table) err+=" in table "+table.getName();
- if ( null != field) err+=" field "+field.getName();
+ String err = msg;
+ if ( null != table ) err += " in table " + table.getName();
+ if ( null != field ) err += " field " + field.getName();
parser.addError( err );
}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Page.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Page.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Page.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -43,7 +43,7 @@
public class Page
{
@XStreamAsAttribute
- String name;
+ private String name;
private String description = "";
@XStreamImplicit
@@ -106,9 +106,7 @@
for ( Field field : getFields() ) field.handleValidation( parser );
}
- /**
- * @return an ArrayList with the direct (1 level deep) field children
- */
+ /** @return an ArrayList with the direct (1 level deep) field children */
public List<Field> getFields()
{
if ( fields == null ) fields = new ArrayList<Field>();
@@ -221,4 +219,4 @@
}
return tb.toString();
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Parser.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Parser.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Parser.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -1,3 +1,27 @@
+/**
+ * This file is part of the equanda project.
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
+ * ANY KIND, either express or implied. See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ */
+
package org.equanda.domain.xml;
import com.thoughtworks.xstream.XStream;
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Select.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Select.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Select.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -86,10 +86,10 @@
ordersAscending = new ArrayList<Boolean>();
if ( hasOrder() )
{
- for ( String fieldName : order.split( "," ) )
+ for ( String loopFieldName : order.split( "," ) )
{
Field field;
- fieldName = fieldName.trim();
+ String fieldName = loopFieldName.trim();
boolean ascending = true;
if ( fieldName.length() > 0 && fieldName.charAt( 0 ) == '-' )
{
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Table.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Table.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Table.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -597,4 +597,4 @@
if ( null == subjectory ) subjectory = new Subjectory();
return subjectory;
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Type.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Type.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/Type.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -281,4 +281,4 @@
if ( hide == null ) return null;
return hide.getHideIfClass();
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/BooleanTest.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/BooleanTest.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/BooleanTest.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -32,4 +32,4 @@
public interface BooleanTest<T>
{
public boolean test( T object );
-}
\ No newline at end of file
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/ListFilter.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/ListFilter.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/ListFilter.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -31,5 +31,5 @@
*/
public interface ListFilter<T>
{
- public boolean isSuitable( T object );
+ boolean isSuitable( T object );
}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/ObjectGetter.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/ObjectGetter.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/ObjectGetter.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -31,5 +31,5 @@
*/
public interface ObjectGetter<T>
{
- public Object get( T obj );
-}
\ No newline at end of file
+ Object get( T obj );
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/TemplateUtil.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/TemplateUtil.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/TemplateUtil.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -40,4 +40,4 @@
if ( filter == null || filter.isSuitable( one ) ) destination.add( one );
}
}
-}
\ No newline at end of file
+}
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/TransformationUtil.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/TransformationUtil.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/aid/TransformationUtil.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -35,8 +35,10 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class TransformationUtil
+public final class TransformationUtil
{
+ private TransformationUtil() {}
+
public static String transformDate( Parser parser, String value )
{
if ( value == null ) return null;
@@ -90,7 +92,7 @@
Field field = null;
for ( String fieldName : path.split( "\\." ) )
{
- char chars[] = fieldName.toCharArray();
+ char[] chars = fieldName.toCharArray();
chars[ 0 ] = Character.toUpperCase( chars[ 0 ] );
String fieldNameTransformed = new String( chars );
field = root.getField( fieldNameTransformed );
Modified: trunk/equanda-dm/src/main/java/org/equanda/domain/xml/transform/RootTable.java
===================================================================
--- trunk/equanda-dm/src/main/java/org/equanda/domain/xml/transform/RootTable.java 2008-12-03 16:51:59 UTC (rev 894)
+++ trunk/equanda-dm/src/main/java/org/equanda/domain/xml/transform/RootTable.java 2008-12-03 17:17:32 UTC (rev 895)
@@ -37,8 +37,7 @@
*
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class
- RootTable
+public class RootTable
{
private DomainModel domainModel;
private String name; // table name
@@ -676,8 +675,10 @@
public boolean equals( Object o )
{
- return ( o instanceof RootTable.PriorityComparator );
+ return ( o instanceof RootTable.PriorityComparator && StringUtil.objectEquals( this, o ) );
}
+
+ public int hashCode() { return super.hashCode(); }
}
public List<Select> getSelects()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
