Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[897] trunk
|
From: <tri...@us...> - 2008-12-03 22:10:28
|
Revision: 897
http://equanda.svn.sourceforge.net/equanda/?rev=897&view=rev
Author: triathlon98
Date: 2008-12-03 22:10:23 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
EQ-299 remove checkstyle errors and warnings
Modified Paths:
--------------
trunk/equanda-tool/src/main/java/org/equanda/tool/all/Tool.java
trunk/equanda-tool/src/main/java/org/equanda/tool/all/ToolWorker.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/DatabaseDialect.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/GenericDialect.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportClient.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportWorker.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportContext.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java
trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ObjectSelector.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/PrintClient.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/PrintWorker.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/Printer.java
trunk/equanda-tool/src/main/java/org/equanda/tool/print/provider/ReportPrintInfo.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/Id.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/Resolver.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ToolMain.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientDisplay.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientHidden.java
trunk/equanda-tool/src/main/java/org/equanda/tool/shared/worker/Worker.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/ImportDialog.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyTable.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyTableModel.java
trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/TranslationsEditor.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/ImportClient.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/ImportWorker.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/PatternMatcher.java
trunk/equanda-tool/src/main/java/org/equanda/tool/ymport/configuration/ImportConfiguration.java
trunk/pom.xml
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/all/Tool.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/all/Tool.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/all/Tool.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -43,9 +43,9 @@
public class Tool
extends ToolMain<AllConfiguration>
{
- public static final Id allId = Id.buildId( "all" );
+ public static final Id ALL_ID = Id.buildId( "all" );
- public static void main( final String args[] )
+ public static void main( final String[] args )
{
Locale.setDefault( new Locale( "xx" ) ); // assure the locale is "known" or at least well defined
ThreadGroup exceptionThreadGroup = new ExceptionGroup();
@@ -72,11 +72,11 @@
public WorkerThread getWorkerThread( AllConfiguration cfg )
throws ToolException
{
- return new WorkerThread<AllConfiguration>( cfg, new ToolWorker( cfg, allId ) );
+ return new WorkerThread<AllConfiguration>( cfg, new ToolWorker( cfg, ALL_ID ) );
}
public Id getId( AllConfiguration allConfiguration )
{
- return allId;
+ return ALL_ID;
}
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/all/ToolWorker.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/all/ToolWorker.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/all/ToolWorker.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,6 +24,7 @@
package org.equanda.tool.all;
+import org.apache.log4j.Logger;
import org.equanda.tool.all.configuration.AllConfiguration;
import org.equanda.tool.export.ExportClient;
import org.equanda.tool.export.ExportWorker;
@@ -34,6 +35,7 @@
import org.equanda.tool.shared.Id;
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.ToolListener;
+import org.equanda.tool.shared.ToolMain;
import org.equanda.tool.shared.worker.Worker;
import org.equanda.tool.ymport.ImportClient;
import org.equanda.tool.ymport.ImportWorker;
@@ -44,6 +46,8 @@
public class ToolWorker
extends Worker<AllConfiguration>
{
+ private static final Logger log = Logger.getLogger( ToolMain.class );
+
protected ArrayList<WorkerInfo> workers = new ArrayList<WorkerInfo>();
public ToolWorker( AllConfiguration cfg, Id id )
@@ -58,7 +62,7 @@
if ( cExport.exists() && cExport.getExportSectionSettings().getScanPeriod() > 0 )
{
skip = (int) ( cExport.getExportSectionSettings().getScanPeriod() / scan ) - 1;
- ExportWorker worker = new ExportWorker( cExport, ExportClient.exportId );
+ ExportWorker worker = new ExportWorker( cExport, ExportClient.EXPORT_ID );
worker.init( cExport );
workers.add( new WorkerInfo( worker, skip ) );
}
@@ -67,7 +71,7 @@
if ( cImport.exists() && cImport.getImportSectionSettings().getScanPeriod() > 0 )
{
skip = (int) ( cImport.getImportSectionSettings().getScanPeriod() / scan ) - 1;
- ImportWorker worker = new ImportWorker( cImport, ImportClient.importId );
+ ImportWorker worker = new ImportWorker( cImport, ImportClient.IMPORT_ID );
worker.init( cImport );
workers.add( new WorkerInfo( worker, skip ) );
}
@@ -76,7 +80,7 @@
if ( cPrint.exists() && cPrint.getPrintSectionSettings().getScanPeriod() > 0 )
{
skip = (int) ( cPrint.getPrintSectionSettings().getScanPeriod() / scan ) - 1;
- PrintWorker worker = new PrintWorker( cPrint, PrintClient.printId );
+ PrintWorker worker = new PrintWorker( cPrint, PrintClient.PRINT_ID );
worker.init( cPrint );
workers.add( new WorkerInfo( worker, skip ) );
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/DatabaseDialect.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/DatabaseDialect.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/DatabaseDialect.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -42,7 +42,7 @@
String getCreateIndexQuery( DatabaseField field );
String getDropIndexQuery( DatabaseField field );
-
+
String getDropIndexQuery( String index );
String getCreateTableQuery( String table );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/GenericDialect.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/GenericDialect.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/GenericDialect.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -76,6 +76,8 @@
case DatabaseField.LINK:
query.append( " CHAR(14) " );
break;
+ default:
+ // oops
}
if ( !"".equals( field.getDefaultValue() ) )
{
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 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/JdbcManager.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -583,4 +583,3 @@
public Exception getException()
{ return oops; }
}
-
\ No newline at end of file
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/ddltool/Utility.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -143,8 +143,8 @@
{
if ( args.length < 3 )
{
- log.info(
- "Usage: utitity <location> <driverclass> <username> <password> [class Databasemap] [operations] [file query.sql]" );
+ log.info( "Usage: utitity <location> <driverclass> <username> <password> " +
+ "[class Databasemap] [operations] [file query.sql]" );
log.info( "DatabaseMap - class which contains database information (tables and fields)" );
log.info( "Operations:" );
log.info( "update - create all tables and fields, update definition if possible;" );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportClient.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportClient.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportClient.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -41,9 +41,9 @@
public class ExportClient
extends ToolMain<ExportConfiguration>
{
- public static final Id exportId = Id.buildId( "export" );
+ public static final Id EXPORT_ID = Id.buildId( "export" );
- public static void main( final String args[] )
+ public static void main( final String[] args )
{
ThreadGroup exceptionThreadGroup = new ExceptionGroup();
new Thread( exceptionThreadGroup, "Init thread" )
@@ -69,11 +69,11 @@
public WorkerThread getWorkerThread( ExportConfiguration cfg )
throws ToolException
{
- return new WorkerThread( cfg, new ExportWorker( cfg, exportId ) );
+ return new WorkerThread( cfg, new ExportWorker( cfg, EXPORT_ID ) );
}
public Id getId( ExportConfiguration exportConfiguration )
{
- return exportId;
+ return EXPORT_ID;
}
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportWorker.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportWorker.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/ExportWorker.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,6 +24,9 @@
package org.equanda.tool.export;
+import javolution.lang.TextBuilder;
+import murlen.util.fscript.*;
+import org.apache.log4j.Logger;
import org.equanda.persistence.EquandaProxy;
import org.equanda.tool.export.configuration.ExportConfiguration;
import org.equanda.tool.export.object.ExportContext;
@@ -33,13 +36,11 @@
import org.equanda.tool.shared.Id;
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.ToolListener;
-import static org.equanda.tool.shared.ToolMain.i18n;
+import static org.equanda.tool.shared.ToolMain.I18N;
import org.equanda.tool.shared.worker.Worker;
+import org.equanda.util.ExceptionUtil;
import org.equanda.util.accessor.ObjectAccessor;
import org.equanda.util.accessor.ObjectAccessorException;
-import org.equanda.util.ExceptionUtil;
-import javolution.lang.TextBuilder;
-import murlen.util.fscript.*;
import javax.transaction.Status;
import javax.transaction.UserTransaction;
@@ -62,6 +63,7 @@
public class ExportWorker
extends Worker<ExportConfiguration>
{
+ private static final Logger log = Logger.getLogger( ExportWorker.class );
private SelectorList selectorList;
private Map<String, FScript> scripts = new HashMap<String, FScript>(); // all the scripts
private ExportContext exportContext;
@@ -169,13 +171,13 @@
catch ( ToolException ece )
{
listener.notifyInfo( ToolListener.STATUS_ENDED, getNotifyInfo(),
- i18n.txt( "error", workerId ) + ece.getMessage() );
+ I18N.txt( "error", workerId ) + ece.getMessage() );
throw ece;
}
catch ( Exception ex )
{
listener.notifyInfo( ToolListener.STATUS_ENDED, getNotifyInfo(),
- i18n.txt( "error", workerId ) + ex.getMessage() );
+ I18N.txt( "error", workerId ) + ex.getMessage() );
throw new ToolException( "problem while exporting", ex );
}
finally
@@ -302,7 +304,8 @@
if ( lastModified == 0 ) lastModified = -1;
}
}
- if ( lastModified != 0 ) {
+ if ( lastModified != 0 )
+ {
exportContext.setLastModified( lastModified );
}
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/configuration/ExportSectionSettings.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -41,14 +41,10 @@
public class ExportSectionSettings
extends Section
{
- /**
- * section name
- */
+ /** section name */
private static final String INI_SECTION_SETTINGS = "settings";
- /**
- * Settings section attributes
- */
+ /** Settings section attributes */
public static final String INI_SETTINGS_SECTION_ATTRIBUTE_EXPORTDIRECTORY = "exportDirectory"; // default: "."
public static final String INI_SETTINGS_SECTION_ATTRIBUTE_SCANPERIOD = "scanPeriod"; // default: -1
public static final String INI_SETTINGS_SECTION_ATTRIBUTE_EXPORT_INFO = "exportInfo";
@@ -118,7 +114,7 @@
evalScripts = new ArrayList<String>();
boolean hasMore = true;
- for ( int index = 1 ; hasMore ; index++ )
+ for ( int index = 1; hasMore ; index++ )
{
String name = ini.getValue( resolvedSectionId, INI_OBJECT_SECTION_ATTRIBUTE_SCRIPT + index );
if ( name == null || name.equals( "" ) )
@@ -138,9 +134,7 @@
return INI_SECTION_SETTINGS;
}
- /**
- * Getters for the database section attributes
- */
+ /** Getters for the database section attributes */
public long getScanPeriod()
{
return scanPeriod;
@@ -161,9 +155,7 @@
return exportDirectory;
}
- /**
- * Get list of scripts names which can be used to extend the ExportContext evaluator
- */
+ /** Get list of scripts names which can be used to extend the ExportContext evaluator */
public Collection<String> getScripts()
{
return evalScripts;
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportContext.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportContext.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportContext.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,25 +24,23 @@
package org.equanda.tool.export.object;
+import javolution.lang.TextBuilder;
+import murlen.util.fscript.*;
+import org.apache.log4j.Logger;
import org.equanda.export.ExportEvaluatorWithCurrent;
import org.equanda.export.ExportException;
import org.equanda.tool.export.configuration.ExportConfiguration;
import org.equanda.tool.shared.ToolException;
-import javolution.lang.TextBuilder;
-import murlen.util.fscript.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Method;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Collection;
-import java.lang.reflect.Method;
-import java.io.FileReader;
-import java.io.File;
-import java.io.BufferedReader;
-import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Allow the export context. This is used to evaluate the ${xxx} expressions
* Allows something like Iterator behavior :
@@ -55,7 +53,7 @@
public class ExportContext
implements ExportEvaluatorWithCurrent
{
- private static final Log log = LogFactory.getLog( ExportContext.class );
+ private static final Logger log = Logger.getLogger( ExportContext.class );
protected ExportConfiguration cfg;
protected Timestamp startTime = new Timestamp( System.currentTimeMillis() );
@@ -88,7 +86,7 @@
Timestamp ts = new Timestamp( lmContext.get( lmContext.size() - 1 ) );
return new FSObject( ts );
}
- else if ( current !=null )
+ else if ( current != null )
{
try
{
@@ -98,7 +96,7 @@
Method method = current.getClass().getMethod( methodName.toString() );
Object res = method.invoke( current );
if ( res instanceof Integer || res instanceof Double || res instanceof FSObject
- || res instanceof String )
+ || res instanceof String )
{
return res;
}
@@ -167,18 +165,14 @@
}
}
- /**
- * start using context
- */
+ /** start using context */
public void start()
{
startTime.setTime( System.currentTimeMillis() );
context.clear();
}
- /**
- * stop using context
- */
+ /** stop using context */
public void stop()
{
context.clear();
@@ -215,7 +209,7 @@
}
if ( index < 0 ) index = 0;
if ( index >= context.size() ) index = context.size() - 1;
- if (index >=0 ) current = context.get( index );
+ if ( index >= 0 ) current = context.get( index );
try
{
Object res = script.evaluateExpression( expression );
@@ -265,9 +259,7 @@
lmContext.add( startTime.getTime() );
}
- /**
- * Remove last added item from context
- */
+ /** Remove last added item from context */
public void popContext()
{
if ( context.size() > 0 )
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ExportHelper.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,12 +24,11 @@
package org.equanda.tool.export.object;
+import org.apache.log4j.Logger;
import org.equanda.export.Export;
import org.equanda.tool.export.configuration.ExportSectionSettings;
import org.equanda.tool.shared.ToolException;
import org.equanda.util.IniFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import java.sql.Date;
import java.sql.Timestamp;
@@ -44,7 +43,7 @@
* @author NetRom team
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public class ExportHelper
+public final class ExportHelper
{
public static final String TYPE_INT = "int";
public static final String TYPE_DOUBLE = "double";
@@ -53,29 +52,29 @@
public static final String TYPE_TIMESTAMP = "Timestamp";
public static final String TYPE_DATE = "Date";
- static Log log = LogFactory.getLog( "org.equanda.tool.export.object.ExportHelper" );
+ private static final Logger log = Logger.getLogger( ExportHelper.class );
- private static Map exportInfo; // Map used by export
- private static IniFile exportIni;
- private static final Export export = new Export();
+ private static Map EXPORT_INFO; // Map used by export
+ private static IniFile EXPORT_INI;
+ private static final Export EXPORT = new Export();
- public static final Hashtable<String, Class> classesMap = new Hashtable<String, Class>();
+ public static final Hashtable<String, Class> CLASSES_MAP = new Hashtable<String, Class>();
static
{
- classesMap.put( TYPE_INT, int.class );
- classesMap.put( TYPE_DOUBLE, double.class );
- classesMap.put( TYPE_BOOLEAN, boolean.class );
- classesMap.put( TYPE_STRING, String.class );
- classesMap.put( TYPE_TIMESTAMP, Timestamp.class );
- classesMap.put( TYPE_DATE, Date.class );
+ CLASSES_MAP.put( TYPE_INT, int.class );
+ CLASSES_MAP.put( TYPE_DOUBLE, double.class );
+ CLASSES_MAP.put( TYPE_BOOLEAN, boolean.class );
+ CLASSES_MAP.put( TYPE_STRING, String.class );
+ CLASSES_MAP.put( TYPE_TIMESTAMP, Timestamp.class );
+ CLASSES_MAP.put( TYPE_DATE, Date.class );
}
- public static final Hashtable<String, Cast> castMap = new Hashtable<String, Cast>();
+ public static final Hashtable<String, Cast> CAST_MAP = new Hashtable<String, Cast>();
static
{
- castMap.put( TYPE_INT, new Cast()
+ CAST_MAP.put( TYPE_INT, new Cast()
{
public Object cast( Object value )
{
@@ -83,7 +82,7 @@
return Integer.valueOf( value.toString() );
}
} );
- castMap.put( TYPE_DOUBLE, new Cast()
+ CAST_MAP.put( TYPE_DOUBLE, new Cast()
{
public Object cast( Object value )
{
@@ -91,7 +90,7 @@
return Double.valueOf( value.toString() );
}
} );
- castMap.put( TYPE_BOOLEAN, new Cast()
+ CAST_MAP.put( TYPE_BOOLEAN, new Cast()
{
public Object cast( Object value )
{
@@ -99,14 +98,14 @@
return Boolean.valueOf( value.toString() );
}
} );
- castMap.put( TYPE_STRING, new Cast()
+ CAST_MAP.put( TYPE_STRING, new Cast()
{
public Object cast( Object value )
{
return value.toString();
}
} );
- castMap.put( TYPE_TIMESTAMP, new Cast()
+ CAST_MAP.put( TYPE_TIMESTAMP, new Cast()
{
public Object cast( Object value )
{
@@ -115,7 +114,7 @@
return Timestamp.valueOf( value.toString() );
}
} );
- castMap.put( TYPE_DATE, new Cast()
+ CAST_MAP.put( TYPE_DATE, new Cast()
{
public Object cast( Object value )
{
@@ -129,28 +128,28 @@
public static void init( ExportSectionSettings settingsExport )
{
- if ( exportInfo == null )
+ if ( EXPORT_INFO == null )
{
// get the ExportInfo map
try
{
- exportInfo =
+ EXPORT_INFO =
(Map) Thread.currentThread().getContextClassLoader().loadClass( settingsExport.getExportInfo() )
.getMethod( "getMap" ).invoke( null );
}
catch ( Exception e )
{
log.error( "Cannot find exportInfo class " + settingsExport.getExportInfo() );
- exportInfo = null;
+ EXPORT_INFO = null;
}
}
- if ( exportIni == null )
+ if ( EXPORT_INI == null )
{
- exportIni = settingsExport.getExportIni();
+ EXPORT_INI = settingsExport.getExportIni();
}
- export.setDirectory( settingsExport.getExportDirectory() );
+ EXPORT.setDirectory( settingsExport.getExportDirectory() );
}
public static boolean export( ExportContext refForName, Object obj, boolean includeDirective,
@@ -161,12 +160,12 @@
{
if ( obj instanceof Collection )
{
- return export
- .export( refForName, (Collection) obj, exportIni, exportInfo, includeDirective, fileMoveMap );
+ return EXPORT
+ .export( refForName, (Collection) obj, EXPORT_INI, EXPORT_INFO, includeDirective, fileMoveMap );
}
else
{
- return export.export( refForName, obj, exportIni, exportInfo, includeDirective, fileMoveMap );
+ return EXPORT.export( refForName, obj, EXPORT_INI, EXPORT_INFO, includeDirective, fileMoveMap );
}
}
catch ( Exception e )
@@ -178,7 +177,7 @@
public static Object cast( String type, Object val )
throws ToolException
{
- Cast cast = castMap.get( type );
+ Cast cast = CAST_MAP.get( type );
if ( cast == null ) throw new ToolException( "Type " + type + " unknown, can't cast" );
try
{
@@ -192,6 +191,6 @@
interface Cast
{
- public Object cast( Object value );
+ Object cast( Object value );
}
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ObjectSelector.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ObjectSelector.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/export/object/ObjectSelector.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -25,9 +25,11 @@
package org.equanda.tool.export.object;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.equanda.export.ExportException;
+import org.equanda.persistence.EquandaProxy;
import org.equanda.persistence.Uoid;
-import org.equanda.persistence.EquandaProxy;
import org.equanda.tool.shared.ToolException;
import org.equanda.util.accessor.ObjectAccessor;
import org.equanda.util.accessor.ObjectAccessorException;
@@ -36,10 +38,7 @@
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Wrapper class for selectors
*
@@ -129,12 +128,13 @@
Class[] param = new Class[selectorParamType.length];
for ( int i = 0; i < param.length ; i++ )
{
- param[ i ] = ExportHelper.classesMap.get( selectorParamType[ i ] );
+ param[ i ] = ExportHelper.CLASSES_MAP.get( selectorParamType[ i ] );
}
try
{
- methodSelect = ObjectAccessor.getMethod( selector.getClass(), "select" + selectorName + "Proxy", param );
+ methodSelect =
+ ObjectAccessor.getMethod( selector.getClass(), "select" + selectorName + "Proxy", param );
methodRemove = ObjectAccessor.getMethod( selector.getClass(), METHOD_REMOVE_SELECTOR, null );
}
catch ( ObjectAccessorException oae )
@@ -269,7 +269,7 @@
if ( log.isDebugEnabled() ) log.debug( "create ejb for " + obj );
ejb = ObjectAccessor.createBean( jndi, name, ObjectAccessor.get( obj, "Uoid" ) );
}
- Class[] param = new Class[]{ ExportHelper.classesMap.get( setFieldType[ i ] ) };
+ Class[] param = new Class[]{ ExportHelper.CLASSES_MAP.get( setFieldType[ i ] ) };
Object[] values = new Object[]{ getParamValue( context, setFieldType[ i ], setFieldValue[ i ] ) };
if ( log.isDebugEnabled() )
{
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/print/PrintClient.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/print/PrintClient.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/print/PrintClient.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -40,14 +40,14 @@
public class PrintClient
extends ToolMain<PrintConfiguration>
{
- public static final Id printId = Id.buildId( "print" );
+ public static final Id PRINT_ID = Id.buildId( "print" );
public String getIniDefault()
{
return "print.ini";
}
- public static void main( final String args[] )
+ public static void main( final String[] args )
{
ThreadGroup exceptionThreadGroup = new ExceptionGroup();
new Thread( exceptionThreadGroup, "Init thread" )
@@ -67,12 +67,12 @@
public Id getId( PrintConfiguration configurationExtra )
{
- return printId;
+ return PRINT_ID;
}
public WorkerThread getWorkerThread( PrintConfiguration cfg )
throws ToolException
{
- return new WorkerThread<PrintConfiguration>( cfg, new PrintWorker( cfg, printId ) );
+ return new WorkerThread<PrintConfiguration>( cfg, new PrintWorker( cfg, PRINT_ID ) );
}
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/print/PrintWorker.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/print/PrintWorker.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/print/PrintWorker.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,18 +24,19 @@
package org.equanda.tool.print;
+import net.sf.jasperreports.engine.JRException;
+import net.sf.jasperreports.engine.JasperPrint;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.log4j.Logger;
import org.equanda.tool.print.configuration.PrintConfiguration;
import org.equanda.tool.print.provider.ReportPrintInfo;
import org.equanda.tool.print.provider.ReportProvider;
import org.equanda.tool.shared.Id;
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.ToolListener;
-import static org.equanda.tool.shared.ToolMain.i18n;
+import static org.equanda.tool.shared.ToolMain.I18N;
import org.equanda.tool.shared.worker.Worker;
-import net.sf.jasperreports.engine.JRException;
-import net.sf.jasperreports.engine.JasperPrint;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
import javax.print.PrintService;
import java.awt.print.PrinterJob;
@@ -55,6 +56,7 @@
public class PrintWorker
extends Worker<PrintConfiguration>
{
+ private static final Logger log = Logger.getLogger( PrintWorker.class );
public static final String REPORT_TYPE_PRINT = "print";
private URL reportURL;
@@ -77,7 +79,7 @@
throws ToolException
{
setWorkDeadline();
- for ( int i = 0 ; i < classes.size() ; i++ )
+ for ( int i = 0; i < classes.size() ; i++ )
{
if ( stopRequested ) return;
@@ -101,7 +103,10 @@
if ( log.isDebugEnabled() ) log.debug( "start loop to print reports" );
for ( ReportPrintInfo info : provider.getReports() )
{
- if ( log.isDebugEnabled() ) log.debug( "found report for printing " + info.getReportName() + " : " + info );
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "found report for printing " + info.getReportName() + " : " + info );
+ }
HttpClient httpConn = new HttpClient();
// set timeout to 5 min
httpConn.setConnectionTimeout( 5 * 60000 );
@@ -113,7 +118,7 @@
post.setParameter( "username", username );
post.setParameter( "password", password );
post.setParameter( "language", info.getReportLanguage() );
-
+
Hashtable<String, String> parameters = info.getParameters();
Enumeration<String> keys = parameters.keys();
while ( keys.hasMoreElements() )
@@ -131,12 +136,15 @@
if ( print.getPages().size() == 0 )
{
- if ( log.isDebugEnabled() ) log.debug( "report has no pages " + info.getReportName() + " : " + info );
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "report has no pages " + info.getReportName() + " : " + info );
+ }
listener.notifyInfo( ToolListener.STATUS_ENDED, classes.get( i ),
- i18n.txt( "nopages", workerId ) );
+ I18N.txt( "nopages", workerId ) );
return;
}
- listener.notifyInfo( ToolListener.STATUS_ENDED, classes.get( i ), i18n.txt( "ok", workerId ) );
+ listener.notifyInfo( ToolListener.STATUS_ENDED, classes.get( i ), I18N.txt( "ok", workerId ) );
if ( log.isDebugEnabled() ) log.debug( "print report " + info.getReportName() + " : " + info );
PrintService ps = getPrintService( info.getPrinterName() );
@@ -144,7 +152,10 @@
// add report infos in order to perform the postPrint actions(update/delete)
printedReports.add( info );
- if ( log.isDebugEnabled() ) log.debug( "finished report printing " + info.getReportName() + " : " + info );
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "finished report printing " + info.getReportName() + " : " + info );
+ }
}
}
catch ( ClassNotFoundException cnfe )
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/print/Printer.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/print/Printer.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/print/Printer.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -76,19 +76,15 @@
switch ( jasperPrint.getOrientation() )
{
case JRReport.ORIENTATION_LANDSCAPE:
- {
- pageFormat.setOrientation( PageFormat.LANDSCAPE );
- paper.setSize( jasperPrint.getPageHeight(), jasperPrint.getPageWidth() );
- paper.setImageableArea( 0, 0, jasperPrint.getPageHeight(), jasperPrint.getPageWidth() );
- break;
- }
+ pageFormat.setOrientation( PageFormat.LANDSCAPE );
+ paper.setSize( jasperPrint.getPageHeight(), jasperPrint.getPageWidth() );
+ paper.setImageableArea( 0, 0, jasperPrint.getPageHeight(), jasperPrint.getPageWidth() );
+ break;
case JRReport.ORIENTATION_PORTRAIT:
- default :
- {
- pageFormat.setOrientation( PageFormat.PORTRAIT );
- paper.setSize( jasperPrint.getPageWidth(), jasperPrint.getPageHeight() );
- paper.setImageableArea( 0, 0, jasperPrint.getPageWidth(), jasperPrint.getPageHeight() );
- }
+ default:
+ pageFormat.setOrientation( PageFormat.PORTRAIT );
+ paper.setSize( jasperPrint.getPageWidth(), jasperPrint.getPageHeight() );
+ paper.setImageableArea( 0, 0, jasperPrint.getPageWidth(), jasperPrint.getPageHeight() );
}
pageFormat.setPaper( paper );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/print/provider/ReportPrintInfo.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/print/provider/ReportPrintInfo.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/print/provider/ReportPrintInfo.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -37,16 +37,16 @@
*/
public interface ReportPrintInfo
{
- public static final DateTimeFormatter dateParser = DateTimeFormat.forPattern( "yyyy-MM-dd" );
- public static final DateTimeFormatter timeParser = DateTimeFormat.forPattern( "yyyy-MM-dd HH:mm:ss" );
+ public static final DateTimeFormatter DATE_PARSER = DateTimeFormat.forPattern( "yyyy-MM-dd" );
+ public static final DateTimeFormatter TIME_PARSER = DateTimeFormat.forPattern( "yyyy-MM-dd HH:mm:ss" );
- public String getReportName();
+ String getReportName();
- public String getPrinterName();
+ String getPrinterName();
- public String getReportLanguage();
+ String getReportLanguage();
- public Hashtable<String, String> getParameters();
+ Hashtable<String, String> getParameters();
- public Uoid getId();
+ Uoid getId();
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/Id.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/Id.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/Id.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -26,11 +26,11 @@
/**
- * Id class (used to id threads and applicatin )
+ * Id class (used to id threads and application )
*
* @author NetRom team
*/
-public class Id
+public final class Id
{
private String id;
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/Resolver.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/Resolver.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/Resolver.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,8 +24,8 @@
package org.equanda.tool.shared;
+import javolution.lang.TextBuilder;
import org.equanda.util.Internationalize;
-import javolution.lang.TextBuilder;
/**
@@ -36,12 +36,13 @@
*/
public class Resolver
{
- private static final Internationalize internat = new Internationalize( true );
+ private static final Internationalize INTERNAT = new Internationalize( true );
/**
* get the i18n string for the given key
*
* @param txt key to be internationalized
+ * @param id id
* @return the internationalized text or the key itself when not found
*/
public String txt( String txt, Id id )
@@ -60,13 +61,13 @@
tb.append( '.' );
tb.append( txt );
String key = tb.toString();
- String res = internat.getResource( key );
+ String res = INTERNAT.getResource( key );
if ( key.equals( res ) )
{
tb.setLength( 0 );
tb.append( "tool:" );
tb.append( txt );
- res = internat.getResource( tb.toString() );
+ res = INTERNAT.getResource( tb.toString() );
}
return res;
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ToolMain.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ToolMain.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ToolMain.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,13 +24,12 @@
package org.equanda.tool.shared;
+import org.apache.log4j.Logger;
import org.equanda.tool.shared.configuration.ConfigurationExtra;
import org.equanda.tool.shared.ui.ToolClient;
import org.equanda.tool.shared.ui.ToolClientDisplay;
import org.equanda.tool.shared.ui.ToolClientHidden;
import org.equanda.tool.shared.worker.WorkerThread;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Shared code for the main routine for the tools
@@ -38,11 +37,11 @@
* @author NetRom team
* @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
*/
-public abstract class ToolMain <T extends ConfigurationExtra>
+public abstract class ToolMain<T extends ConfigurationExtra>
{
- public static final Resolver i18n = new Resolver();
+ public static final Resolver I18N = new Resolver();
- private static Log log = LogFactory.getLog( ToolMain.class.getName() );
+ private static final Logger log = Logger.getLogger( ToolMain.class );
private WorkerThread worker;
/**
@@ -50,7 +49,7 @@
*
* @param args can contain the location of the .ini file to use (default import.ini)
*/
- public void start( final String args[] )
+ public void start( final String[] args )
{
ToolClient app;
T cfg;
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/configuration/ConfigurationMain.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -42,17 +42,13 @@
*/
public class ConfigurationMain
{
- /**
- * sections
- */
+ /** sections */
SectionGeneral sectionGeneral;
SectionDataBase sectionDataBase;
SectionConfig sectionConfig;
SectionOM sectionOM;
- /**
- * ini file
- */
+ /** ini file */
private IniFile ini;
public ConfigurationMain( String iniFileName )
@@ -69,9 +65,9 @@
init();
}
- public ConfigurationMain( IniFile ini_ )
+ public ConfigurationMain( IniFile newIni )
{
- ini = ini_;
+ ini = newIni;
init();
}
@@ -102,9 +98,7 @@
return ini;
}
- /**
- * getters for sections
- */
+ /* getters for sections */
public SectionGeneral getSectionGeneral()
{
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientDisplay.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientDisplay.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientDisplay.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,21 +24,19 @@
package org.equanda.tool.shared.ui;
+import javolution.lang.TextBuilder;
+import org.apache.log4j.Logger;
import org.equanda.tool.shared.Id;
import org.equanda.tool.shared.ToolException;
import org.equanda.tool.shared.ToolListener;
+import static org.equanda.tool.shared.ToolMain.I18N;
import org.equanda.tool.shared.worker.WorkerThread;
-import javolution.lang.TextBuilder;
import javax.swing.*;
import javax.swing.border.EtchedBorder;
import java.awt.*;
import java.awt.event.WindowEvent;
-import static org.equanda.tool.shared.ToolMain.i18n;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* Client class for tool in the case user wants the window to be displayed
*
@@ -49,24 +47,22 @@
extends JFrame
implements ToolClient
{
- protected Log log = LogFactory.getLog( this.getClass() );
+ private static final Logger log = Logger.getLogger( ToolClientDisplay.class );
- /**
- * local fields
- */
+ /** local fields */
private JTextArea info = new JTextArea();
private JTextArea status = new JTextArea();
private WorkerThread workThread;
private Id appId;
- public ToolClientDisplay( WorkerThread thread, Id appId_, String title )
+ public ToolClientDisplay( WorkerThread thread, Id newAppId, String title )
throws ToolException
{
- super( title == null || title.equals( "" ) ? i18n.txt( "title", appId_ ) : title );
+ super( title == null || title.equals( "" ) ? I18N.txt( "title", newAppId ) : title );
workThread = thread;
workThread.setListener( new ToolAdapter() );
- appId = appId_;
+ appId = newAppId;
try
{
Class plaf = Thread.currentThread().getContextClassLoader().loadClass(
@@ -92,22 +88,22 @@
info.setBackground( UIManager.getColor( "Panel.background" ) );
info.setColumns( 50 );
- info.setText( i18n.txt( "file", appId ) + '\n' + i18n.txt( "results", appId ) );
+ info.setText( I18N.txt( "file", appId ) + '\n' + I18N.txt( "results", appId ) );
GridBagConstraints constr = new GridBagConstraints( 0, 0, 1, 1, 0.0, 0.0
- , GridBagConstraints.CENTER, GridBagConstraints.BOTH,
+ , GridBagConstraints.CENTER, GridBagConstraints.BOTH,
new Insets( 10, 0, 10, 0 ), 0, 0 );
JPanel statusPanel = new JPanel( new GridBagLayout() );
statusPanel.setBorder( new EtchedBorder() );
- statusPanel.add( new JLabel( i18n.txt( "current-status", appId ) ) );
+ statusPanel.add( new JLabel( I18N.txt( "current-status", appId ) ) );
constr.gridy = 1;
constr.insets = new Insets( 10, 0, 10, 0 );
statusPanel.add( status, constr );
JPanel infoPanel = new JPanel( new GridBagLayout() );
infoPanel.setBorder( new EtchedBorder() );
- infoPanel.add( new JLabel( i18n.txt( "info", appId ) ) );
+ infoPanel.add( new JLabel( I18N.txt( "info", appId ) ) );
constr.gridy = 1;
constr.insets = new Insets( 10, 0, 10, 0 );
infoPanel.add( info, constr );
@@ -133,16 +129,16 @@
{
public void run()
{
- int option = JOptionPane.showConfirmDialog( ToolClientDisplay.this, i18n.txt( "are-you-sure",
+ int option = JOptionPane.showConfirmDialog( ToolClientDisplay.this, I18N.txt( "are-you-sure",
appId ),
- i18n.txt( "information", appId ),
+ I18N.txt( "information", appId ),
JOptionPane.YES_NO_OPTION,
JOptionPane.QUESTION_MESSAGE );
if ( option == JOptionPane.OK_OPTION )
{
// send only notification to the thread to stop, he will do the actual exit after clean up
workThread.stopWork();
- setStatus( i18n.txt( "waiting-to-shutdown", appId ) );
+ setStatus( I18N.txt( "waiting-to-shutdown", appId ) );
}
}
} );
@@ -151,14 +147,12 @@
}
- /**
- * Set the new worker thread.
- */
+ /** Set the new worker thread. */
public void setWorker( WorkerThread worker )
{
workThread = worker;
}
-
+
private void setInfo( String text )
{
info.setText( text );
@@ -175,9 +169,7 @@
this.setVisible( true );
}
- /**
- * implements the listener
- */
+ /** implements the listener */
class ToolAdapter
implements ToolListener
{
@@ -190,11 +182,11 @@
public void run()
{
TextBuilder output = TextBuilder.newInstance();
- output.append( i18n.txt( status, appId ) );
+ output.append( I18N.txt( status, appId ) );
output.append( ' ' );
output.append( file == null ? "" : file );
output.append( '\n' );
- output.append( i18n.txt( ToolListener.STATUS_ENDED, appId ) );
+ output.append( I18N.txt( ToolListener.STATUS_ENDED, appId ) );
output.append( info == null ? "" : info );
setInfo( output.toString() );
}
@@ -209,7 +201,7 @@
public void run()
{
TextBuilder output = TextBuilder.newInstance();
- output.append( i18n.txt( status, appId ) );
+ output.append( I18N.txt( status, appId ) );
output.append( ' ' );
output.append( file == null ? "" : file );
setStatus( output.toString() );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientHidden.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientHidden.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/ui/ToolClientHidden.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -21,12 +21,13 @@
* 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.tool.shared.ui;
import javolution.lang.TextBuilder;
import org.equanda.tool.shared.Id;
import org.equanda.tool.shared.ToolListener;
-import static org.equanda.tool.shared.ToolMain.i18n;
+import static org.equanda.tool.shared.ToolMain.I18N;
import org.equanda.tool.shared.worker.WorkerThread;
/**
@@ -41,11 +42,11 @@
private WorkerThread workThread;
private Id appId;
- public ToolClientHidden( WorkerThread thread, Id appId_ )
+ public ToolClientHidden( WorkerThread thread, Id newAppId )
{
workThread = thread;
workThread.setListener( new ToolAdapter() );
- appId = appId_;
+ appId = newAppId;
/**
* set a shutdown hook
* also catches ^C
@@ -55,8 +56,8 @@
{
public void run()
{
- System.out.println( i18n.txt( "shutdown-command-received", appId ) );
- System.out.println( i18n.txt( "waiting-to-shutdown", appId ) );
+ System.out.println( I18N.txt( "shutdown-command-received", appId ) );
+ System.out.println( I18N.txt( "waiting-to-shutdown", appId ) );
workThread.stopWork();
try
{
@@ -67,7 +68,6 @@
{}
}
} );
-
}
private void setInfo( String text )
@@ -82,32 +82,28 @@
private void showError( String info )
{
- System.out.println( i18n.txt( "error", appId ) + info );
+ System.out.println( I18N.txt( "error", appId ) + info );
}
- /**
- * Set the new worker thread.
- */
+ /** Set the new worker thread. */
public void setWorker( WorkerThread worker )
{
workThread = worker;
- }
+ }
public void startThread()
{
workThread.start();
}
- /**
- * implements the import listener
- */
+ /** implements the import listener */
class ToolAdapter
implements ToolListener
{
public void notifyInfo( final String status, final String file, final String extra )
{
TextBuilder output = TextBuilder.newInstance();
- output.append( i18n.txt( status, appId ) );
+ output.append( I18N.txt( status, appId ) );
output.append( ' ' );
output.append( extra == null ? "" : extra );
setInfo( output.toString() );
@@ -116,7 +112,7 @@
public void notifyStatus( final String status, final String extra )
{
TextBuilder output = TextBuilder.newInstance();
- output.append( i18n.txt( status, appId ) );
+ output.append( I18N.txt( status, appId ) );
output.append( ' ' );
output.append( extra == null ? "" : extra );
setStatus( output.toString() );
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/shared/worker/Worker.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/shared/worker/Worker.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/shared/worker/Worker.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -24,19 +24,18 @@
package org.equanda.tool.shared.worker;
-import org.equanda.tool.shared.Id;
-import org.equanda.tool.shared.ToolException;
-import org.equanda.tool.shared.ToolListener;
-import org.equanda.tool.shared.configuration.ConfigurationExtra;
-import org.equanda.util.script.*;
-import org.equanda.util.alert.AlertUtil;
import javolution.lang.TextBuilder;
import murlen.util.fscript.FSException;
import murlen.util.fscript.FSFastExtension;
import murlen.util.fscript.FSFunctionExtension;
import murlen.util.fscript.FSVarExtension;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
+import org.equanda.tool.shared.Id;
+import org.equanda.tool.shared.ToolException;
+import org.equanda.tool.shared.ToolListener;
+import org.equanda.tool.shared.configuration.ConfigurationExtra;
+import org.equanda.util.alert.AlertUtil;
+import org.equanda.util.script.*;
import javax.transaction.UserTransaction;
import java.io.IOException;
@@ -48,9 +47,9 @@
*
* @author NetRom team
*/
-public abstract class Worker <T extends ConfigurationExtra>
+public abstract class Worker<T extends ConfigurationExtra>
{
- protected Log log = LogFactory.getLog( this.getClass() );
+ private static final Logger log = Logger.getLogger( Worker.class );
protected ToolListener listener;
protected boolean stopRequested;
@@ -89,9 +88,9 @@
/* other methods are reusable (but may need some extending) */
- public Worker( T cfg, Id id_ )
+ public Worker( T cfg, Id newId )
{
- workerId = id_;
+ workerId = newId;
listener = new EmptyListener();
@@ -134,9 +133,9 @@
StringExtension.addExtension( fastExtension );
GeneralExtension.addExtension( fastExtension );
FileExtension.addExtension( fastExtension );
- DMExtension DMExt = new DMExtension( cfg.getMainConfiguration().getIni(), "om,",
- cfg.getMainConfiguration().getSectionOM().getOmConnections() );
- DMExt.addExtension( fastExtension );
+ DMExtension dmExtension = new DMExtension( cfg.getMainConfiguration().getIni(), "om,",
+ cfg.getMainConfiguration().getSectionOM().getOmConnections() );
+ dmExtension.addExtension( fastExtension );
fastExtension.addVarExtension( "stopRequested", new FSVarExtension()
{
public Object getVar( String s )
@@ -254,9 +253,7 @@
return workerId;
}
- /**
- * stops the thread
- */
+ /** stops the thread */
public void stopWork()
{
stopRequested = true;
@@ -342,12 +339,12 @@
private class EmptyListener
implements ToolListener
{
- public void notifyInfo( String status, String file, String info ){}
+ public void notifyInfo( String status, String file, String info ) {}
- public void notifyStatus( String status, String info ){}
+ public void notifyStatus( String status, String info ) {}
- public void notifyError( String info ){}
+ public void notifyError( String info ) {}
- public void notifyFinished(){}
+ public void notifyFinished() {}
}
}
Modified: trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/ImportDialog.java
===================================================================
--- trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/ImportDialog.java 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/ImportDialog.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -21,19 +21,20 @@
* 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.tool.translationsEditor;
import org.equanda.translations.Key;
import org.equanda.translations.Translation;
import javax.swing.*;
+import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import java.util.Enumeration;
import java.util.Properties;
-import java.util.Enumeration;
import java.util.TreeMap;
/**
@@ -49,7 +50,7 @@
private JCheckBox checkBoxContextFileName = new JCheckBox( "Use file name as context" );
private JCheckBox checkBoxKeysOnly = new JCheckBox( "Import keys only" );
private JCheckBox checkBoxOverwrite = new JCheckBox( "Overwrite if key exists" );
- private String languages[];
+ private String[] languages;
private KeyTableModel model;
public ImportDialog()
@@ -140,10 +141,10 @@
return;
}
- File[] children=file.listFiles();
- for (File child: children)
+ File[] children = file.listFiles();
+ for ( File child : children )
{
- importProperties(child.getAbsolutePath(), context, contextFromFileName, keysOnly, overwrite);
+ importProperties( child.getAbsolutePath(), context, contextFromFileName, keysOnly, overwrite );
}
}
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 2008-12-03 17:58:16 UTC (rev 896)
+++ trunk/equanda-tool/src/main/java/org/equanda/tool/translationsEditor/KeyEditorPanel.java 2008-12-03 22:10:23 UTC (rev 897)
@@ -50,7 +50,7 @@
private JTextField context = new JTextField();
private JTextArea description = new JTextArea();
private TreeMap<String, JTextField[]> translationsTextFields;
- private String languages[];
+ private String[] languages;
private Key key;
private KeyTableModel model;
private DomainModel domainModel;
@@ -64,7 +64,7 @@
this.domainModel = domainModel;
}
- public KeyEditorPanel( String languages[], KeyTableModel model )
+ public KeyEditorPanel( String[] languages, KeyTableModel model )
{
this.languages = languages;
this.model = model;
@@ -78,7 +78,7 @@
GridBagConstraints constr = new GridBagConstraints( 0, 0, 1, 1, 1.0, 1.0
, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
- new Insets( 2, 2, 2, 2 ), 0, 0 );
+ new Insets( 2, 2, 2, 2 ), 0, 0 );
constr.weightx = 1.0;
trans.add( new JLabel( "Context : " ), constr );
@@ -379,7 +379,7 @@
hasChanged.run();
}
- /** Clear the fields. Useful when the last key was removed from the table and there's no other to update the fields. */
+ /** Clear the fields. Useful when last key was removed from the table and there's no other to update the fields. */
public void clear()
{
context.setText( "" );
Modified: tru...
[truncated message content] |
