Author: tchemit Date: 2014-03-23 14:53:47 +0100 (Sun, 23 Mar 2014) New Revision: 1163 Url: http://forge.codelutin.com/projects/coser/repository/revisions/1163 Log: fix build + usage of StringBuilder instead of StringBuffer Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserExceptionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/publication/GlobalResultHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2014-03-23 13:32:50 UTC (rev 1162) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserUtils.java 2014-03-23 13:53:47 UTC (rev 1163) @@ -74,7 +74,7 @@ * @return string */ public static String convertBracketString(List<String> args) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); Iterator<String> itArgs = args.iterator(); while (itArgs.hasNext()) { Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2014-03-23 13:32:50 UTC (rev 1162) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/command/MergeSpeciesCommand.java 2014-03-23 13:53:47 UTC (rev 1163) @@ -134,7 +134,7 @@ if (specyFound) { // compute key (attention a ne pas prendre en compte l'espece : elle change) - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int tupleIndex = 0 ; tupleIndex < tuple.length; ++tupleIndex) { if (tupleIndex == Length.INDEX_SURVEY || tupleIndex == Length.INDEX_YEAR || tupleIndex == Length.INDEX_HAUL || tupleIndex == Length.INDEX_SEX || @@ -268,7 +268,7 @@ if (specyFound) { // compute key (attention a ne pas prendre en compte l'espece : elle change) - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int tupleIndex = 0 ; tupleIndex < tuple.length; ++tupleIndex) { if (tupleIndex == Catch.INDEX_SURVEY || tupleIndex == Catch.INDEX_YEAR || tupleIndex == Catch.INDEX_HAUL) { Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2014-03-23 13:32:50 UTC (rev 1162) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2014-03-23 13:53:47 UTC (rev 1163) @@ -516,7 +516,7 @@ } // compute key - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int tupleIndex = 0 ; tupleIndex < tuple.length; ++tupleIndex) { if (tupleIndex == Catch.INDEX_YEAR || tupleIndex == Catch.INDEX_HAUL) { sb.append(tuple[tupleIndex]).append(';'); @@ -802,7 +802,7 @@ } // compute key - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int tupleIndex = 0 ; tupleIndex < tuple.length; ++tupleIndex) { if (tupleIndex == Length.INDEX_YEAR || tupleIndex == Length.INDEX_HAUL || tupleIndex == Length.INDEX_SPECIES) { Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserExceptionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserExceptionHandler.java 2014-03-23 13:32:50 UTC (rev 1162) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/CoserExceptionHandler.java 2014-03-23 13:53:47 UTC (rev 1163) @@ -58,7 +58,7 @@ if (log.isErrorEnabled()) { log.error("Global application exception", ex); } - ErrorHelper errorHelper = new ErrorHelper(Coser.coserConfig); + ErrorHelper errorHelper = new ErrorHelper(); errorHelper.showErrorDialog(null, ex.getMessage(), ex); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/publication/GlobalResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/publication/GlobalResultHandler.java 2014-03-23 13:32:50 UTC (rev 1162) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/publication/GlobalResultHandler.java 2014-03-23 13:53:47 UTC (rev 1163) @@ -212,7 +212,7 @@ } catch (Exception ex) { //throw new CoserException("Can't get upload status", ex); // FIXME chatellier 20110126 le dispatch global marche pas ? :( - ErrorHelper errorHelper = new ErrorHelper(view.getContextValue(CoserConfig.class)); + ErrorHelper errorHelper = new ErrorHelper(); errorHelper.showErrorDialog(view, ex.getMessage(), ex); } finally { setDefaultCursor(view); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2014-03-23 13:32:50 UTC (rev 1162) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/result/ResultHandler.java 2014-03-23 13:53:47 UTC (rev 1163) @@ -208,7 +208,7 @@ catch (Exception ex) { //throw new CoserException("Can't get upload status", ex); // FIXME chatellier 20110126 le dispatch global marche pas ? :( - ErrorHelper errorHelper = new ErrorHelper(view.getContextValue(CoserConfig.class)); + ErrorHelper errorHelper = new ErrorHelper(); errorHelper.showErrorDialog(view, ex.getMessage(), ex); } finally { Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java 2014-03-23 13:32:50 UTC (rev 1162) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/util/ErrorHelper.java 2014-03-23 13:53:47 UTC (rev 1163) @@ -34,6 +34,7 @@ import javax.swing.JOptionPane; +import fr.ifremer.coser.CoserUIApplicationContext; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,8 +64,8 @@ protected CoserConfig coserConfig; - public ErrorHelper(CoserConfig coserConfig) { - this.coserConfig = coserConfig; + public ErrorHelper() { + this.coserConfig = CoserUIApplicationContext.get().getConfig(); } /** @@ -126,7 +127,7 @@ email.addReplyTo("no-reply@forge.codelutin.com"); // message description - StringBuffer message = new StringBuffer(); + StringBuilder message = new StringBuilder(); message.append(formatMessage("Project", "Coser " + coserConfig.getApplicationVersion())); message.append(formatMessage("Date", new Date().toString())); message.append(formatMessage("Title", errorInfo.getTitle())); @@ -139,7 +140,11 @@ for (String propertyName : propertiesNames) { // security, don't send string containing password : if (!propertyName.contains("pass")) { - message.append("\t" + propertyName + " : " + coserConfig.getOptions().getProperty(propertyName) + "\n"); + message.append("\t"); + message.append(propertyName); + message.append(" : "); + message.append(coserConfig.getOptions().getProperty(propertyName)); + message.append("\n"); } }