This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6d2c40bb349fdf7a81e23684c3da5c5c68691325 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 16:08:30 2015 +0200 Deplacement et renommage de l'exception technique de l'application swing --- .../src/main/java/fr/ird/observe/ObserveRunner.java | 7 +++---- ...calException.java => ObserveSwingTechnicalException.java} | 12 ++++++------ .../java/fr/ird/observe/ui/content/ContentUIHandler.java | 4 ++-- .../main/java/fr/ird/observe/ui/content/ContentUIModel.java | 4 ++-- .../fr/ird/observe/ui/content/table/ContentTableUIModel.java | 4 ++-- .../ui/content/table/impl/longline/SensorUsedUIHandler.java | 10 +++++----- .../observe/ui/content/table/impl/longline/TdrUIHandler.java | 10 +++++----- .../ird/observe/ui/util/tripMap/TripMapContentBuilder.java | 4 ++-- .../fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java | 6 +++--- 9 files changed, 30 insertions(+), 31 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java index 920f3eb..d4ca764 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -22,7 +22,6 @@ package fr.ird.observe; import com.google.common.base.Preconditions; -import fr.ird.observe.business.ObserveTechnicalException; import fr.ird.observe.business.converter.FloatConverter; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.ui.ObserveMainUI; @@ -249,7 +248,7 @@ public abstract class ObserveRunner extends ApplicationRunner { try { resource = logFile.toURI().toURL(); } catch (MalformedURLException mue) { - throw new ObserveTechnicalException("Unable to load log configuration", mue); + throw new ObserveSwingTechnicalException("Unable to load log configuration", mue); } if (log.isInfoEnabled()) { @@ -599,7 +598,7 @@ public abstract class ObserveRunner extends ApplicationRunner { try { resourceManager.copyResource(Resource.ui, file, message); } catch (IOException e) { - throw new ObserveTechnicalException("could not copy ui configuration: " + file, e); + throw new ObserveSwingTechnicalException("could not copy ui configuration: " + file, e); } } @@ -611,7 +610,7 @@ public abstract class ObserveRunner extends ApplicationRunner { UIHelper.loadUIConfig(p); } catch (IOException e) { - throw new ObserveTechnicalException("could not load ui configuration: " + file, e); + throw new ObserveSwingTechnicalException("could not load ui configuration: " + file, e); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveTechnicalException.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingTechnicalException.java similarity index 75% rename from observe-application-swing/src/main/java/fr/ird/observe/business/ObserveTechnicalException.java rename to observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingTechnicalException.java index f362557..ca73a1e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/business/ObserveTechnicalException.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingTechnicalException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business; +package fr.ird.observe; /* * #%L @@ -28,22 +28,22 @@ package fr.ird.observe.business; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ObserveTechnicalException extends RuntimeException { +public class ObserveSwingTechnicalException extends RuntimeException { private static final long serialVersionUID = 1L; - public ObserveTechnicalException() { + public ObserveSwingTechnicalException() { } - public ObserveTechnicalException(String message) { + public ObserveSwingTechnicalException(String message) { super(message); } - public ObserveTechnicalException(String message, Throwable cause) { + public ObserveSwingTechnicalException(String message, Throwable cause) { super(message, cause); } - public ObserveTechnicalException(Throwable cause) { + public ObserveSwingTechnicalException(Throwable cause) { super(cause); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java index 9d88f06..47288ca 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.content; import fr.ird.observe.ObserveOpenDataManager; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.BinderService; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.db.ObserveSwingDataSource; @@ -114,7 +114,7 @@ public abstract class ContentUIHandler<E extends IdDto> { return handler; } catch (Exception e) { - throw new ObserveTechnicalException("Could not create handler for ui: " + ui, e); + throw new ObserveSwingTechnicalException("Could not create handler for ui: " + ui, e); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java index c78578c..962f0ce 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content; import fr.ird.observe.business.BinderService; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import org.apache.commons.logging.Log; @@ -115,7 +115,7 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab return model; } catch (Exception e) { - throw new ObserveTechnicalException("Could not create model for ui: " + ui, e); + throw new ObserveSwingTechnicalException("Could not create model for ui: " + ui, e); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java index ec1742a..a2aa0fe 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.ui.content.table; import fr.ird.observe.business.BinderService; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.ui.content.ContentUIModel; import org.apache.commons.lang3.reflect.ConstructorUtils; @@ -107,7 +107,7 @@ public abstract class ContentTableUIModel<E extends IdDto, D extends IdDto> exte return model; } catch (Exception e) { - throw new ObserveTechnicalException("Could not create model for ui: " + ui, e); + throw new ObserveSwingTechnicalException("Could not create model for ui: " + ui, e); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java index c4e32fe..71e7cfd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -26,7 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -148,9 +148,9 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD mainUI.getStatus().setStatus(t("observe.sensorUsed.message.data.imported", file)); } catch (IOException e) { - throw new ObserveTechnicalException("Could not read file: " + file, e); + throw new ObserveSwingTechnicalException("Could not read file: " + file, e); } catch (SQLException e) { - throw new ObserveTechnicalException("Could not create binary data from file: " + file, e); + throw new ObserveSwingTechnicalException("Could not create binary data from file: " + file, e); } } @@ -212,7 +212,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD try { binaryStream = getTableEditBean().getData().getBinaryStream(); } catch (SQLException e) { - throw new ObserveTechnicalException("Could not read binary data", e); + throw new ObserveSwingTechnicalException("Could not read binary data", e); } OutputStream outputstream = null; @@ -225,7 +225,7 @@ public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineD ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getObserveMainUI(); mainUI.getStatus().setStatus(t("observe.sensorUsed.message.data.exported", file)); } catch (IOException e) { - throw new ObserveTechnicalException("Could not save binary data to " + file, e); + throw new ObserveSwingTechnicalException("Could not save binary data to " + file, e); } finally { IOUtils.closeQuietly(outputstream); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java index c0f7776..1cc9251 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/longline/TdrUIHandler.java @@ -26,7 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.io.FileWriteMode; import com.google.common.io.Files; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; @@ -327,9 +327,9 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> mainUI.getStatus().setStatus(t("observe.tdr.message.data.imported", file)); } catch (IOException e) { - throw new ObserveTechnicalException("Could not read file: " + file, e); + throw new ObserveSwingTechnicalException("Could not read file: " + file, e); } catch (SQLException e) { - throw new ObserveTechnicalException("Could not create binary data from file: " + file, e); + throw new ObserveSwingTechnicalException("Could not create binary data from file: " + file, e); } } @@ -391,7 +391,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> try { binaryStream = getTableEditBean().getData().getBinaryStream(); } catch (SQLException e) { - throw new ObserveTechnicalException("Could not read binary data", e); + throw new ObserveSwingTechnicalException("Could not read binary data", e); } OutputStream outputstream = null; @@ -404,7 +404,7 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineDto, TdrDto> ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getObserveMainUI(); mainUI.getStatus().setStatus(t("observe.sensorUsed.message.data.exported", file)); } catch (IOException e) { - throw new ObserveTechnicalException("Could not save binary data to " + file, e); + throw new ObserveSwingTechnicalException("Could not save binary data to " + file, e); } finally { IOUtils.closeQuietly(outputstream); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java index 7b77a75..d9b3c1c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapContentBuilder.java @@ -33,7 +33,7 @@ import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Polygon; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.constants.TripMapPointType; import org.apache.commons.lang3.StringUtils; @@ -465,7 +465,7 @@ public class TripMapContentBuilder { Style style = findStyle(styledLayerDescriptor, layerName, styleName, null); if (style == null) { - throw new ObserveTechnicalException(String.format("No style found for layer name '%s' and style name '%s'", layerName, styleName)); + throw new ObserveSwingTechnicalException(String.format("No style found for layer name '%s' and style name '%s'", layerName, styleName)); } return style; diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java index 06870bc..7c1ec8f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/tripMap/TripMapUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.ui.util.tripMap; import com.google.common.collect.Lists; import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.business.ObserveTechnicalException; +import fr.ird.observe.ObserveSwingTechnicalException; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.TripMapDto; @@ -154,7 +154,7 @@ public class TripMapUIHandler { mapPane.setLegendItems(mapContentBuilder.getLegendItems()); } catch (Exception e) { - throw new ObserveTechnicalException("Unable to load trip map activity points", e); + throw new ObserveSwingTechnicalException("Unable to load trip map activity points", e); } finally { ObserveSwingApplicationContext.get().getObserveMainUI().setBusy(false); } @@ -199,7 +199,7 @@ public class TripMapUIHandler { try { ImageIO.write(im, "PNG", file); } catch (IOException e) { - throw new ObserveTechnicalException("unable to export map ", e); + throw new ObserveSwingTechnicalException("unable to export map ", e); } UIHelper.displayInfo(t("observe.map.export.success", file)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.