- Sammoa-commits - mailman.cloud.codelutin.com

r485 - trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map
by tchemit＠users.forge.codelutin.com 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 13:16:30 +0200 (Wed, 29 Aug 2012) New Revision: 485 Url: http://forge.codelutin.com/repositories/revision/sammoa/485 Log: fixes #1430: Bug ?\195?\160 l'export des shp d'observation Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-29 10:51:15 UTC (rev 484) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/output/map/ExportMapService.java 2012-08-29 11:16:30 UTC (rev 485) @@ -521,8 +521,13 @@ record.put("SWIM_DIR", observation.getSwimDir()); record.put("CALVES", observation.getCalves()); record.put("PHOTO", observation.isPhoto()); - record.put("OBSERVER", observation.getObserverPosition().getObserver().getInitials()); - record.put("SIDE", observation.getObserverPosition().getPosition()); + ObserverPosition observerPosition = observation.getObserverPosition(); + if (observerPosition != null) { + if (observerPosition.getObserver() == null) { + record.put("OBSERVER", observerPosition.getObserver().getInitials()); + } + record.put("SIDE", observerPosition.getPosition()); + } record.put("STATUS", observation.getObservationStatus()); record.put("COMMENT", observation.getComment());

1 0

r484 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application sammoa-application/src/main/resources/i18n sammoa-ui-swing/src/main sammoa-ui-swing/src/main/filters sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/resources sammoa-ui-swing/src/main/resources/i18n
by fdesbois＠users.forge.codelutin.com 29 Aug '12

29 Aug '12

Author: fdesbois Date: 2012-08-29 12:51:15 +0200 (Wed, 29 Aug 2012) New Revision: 484 Url: http://forge.codelutin.com/repositories/revision/sammoa/484 Log: fixes #1428 : improve bottom text in about window Added: trunk/sammoa-ui-swing/src/main/filters/ trunk/sammoa-ui-swing/src/main/filters/sammoa.properties Removed: trunk/sammoa-ui-swing/src/main/resources/sammoa.properties Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-08-29 09:08:29 UTC (rev 483) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-08-29 10:51:15 UTC (rev 484) @@ -43,7 +43,6 @@ import java.net.URL; import java.util.Locale; -import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -184,6 +183,16 @@ return applicationConfig.getOptionAsURL(SammoaConfigOption.SITE_URL.key); } + /** @return {@link SammoaConfigOption#ORGANIZATION_NAME} value */ + public String getOrganizationName() { + return applicationConfig.getOption(SammoaConfigOption.ORGANIZATION_NAME.key); + } + + /** @return {@link SammoaConfigOption#INCEPTION_YEAR} value */ + public int getInceptionYear() { + return applicationConfig.getOptionAsInt(SammoaConfigOption.INCEPTION_YEAR.key); + } + /** @return {@link SammoaConfigOption#LOCALE} value */ public Locale getLocale() { return applicationConfig.getOption(Locale.class, SammoaConfigOption.LOCALE.key); @@ -193,10 +202,6 @@ applicationConfig.setOption(SammoaConfigOption.LOCALE.key, locale.toString()); } - public String getCopyrightText() { - return _("sammoa.copyright.text", getVersion()); - } - /** @return {@link SammoaConfigOption#DATA_DIRECTORY} value */ public File getDataDirectory() { File result = getOrCreateDirectory(SammoaConfigOption.DATA_DIRECTORY); @@ -367,18 +372,34 @@ Locale.UK.toString(), Locale.class ), - VERSION("application.version", + VERSION("sammoa.version", n_("sammoa.config.application.version"), "", Version.class, false, true ), - SITE_URL("application.site.url", + SITE_URL("sammoa.url", n_("sammoa.config.application.site.url"), - "http://maven-site.forge.codelutin.com/sammoa/", - URL.class + "", + URL.class, + false, + true ), + ORGANIZATION_NAME("sammoa.organizationName", + n_("sammoa.config.license.organizationName"), + "", + String.class, + false, + true + ), + INCEPTION_YEAR("sammoa.inceptionYear", + n_("sammoa.config.license.organizationName"), + "2012", + Integer.class, + false, + true + ), ADMIN_EMAIL("admin.email", n_("sammoa.config.admin.email"), "fdesbois(a)codelutin.com", Modified: trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties =================================================================== --- trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-29 09:08:29 UTC (rev 483) +++ trunk/sammoa-application/src/main/resources/i18n/sammoa-application_en_GB.properties 2012-08-29 10:51:15 UTC (rev 484) @@ -30,7 +30,6 @@ sammoa.config.ui.stop=Stop sammoa.config.ui.validObservation=Validate the selected observation sammoa.config.ui.validRoute=Validate the selected route -sammoa.copyright.text=Copyright CRMM 2012 sammoa.datePattern=dd/MM/yyyy sammoa.dateTimePattern=dd/MM/yyyy HH\:mm\:ss sammoa.dbf.import.error.unableToReadField=impossible to read value for column %s at line %s Copied: trunk/sammoa-ui-swing/src/main/filters/sammoa.properties (from rev 483, trunk/sammoa-ui-swing/src/main/resources/sammoa.properties) =================================================================== --- trunk/sammoa-ui-swing/src/main/filters/sammoa.properties (rev 0) +++ trunk/sammoa-ui-swing/src/main/filters/sammoa.properties 2012-08-29 10:51:15 UTC (rev 484) @@ -0,0 +1,39 @@ +### +# #%L +# SAMMOA :: UI Swing +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 UMS 3462, Code Lutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +## DB Configuration +hibernate.hbm2ddl.auto=update +hibernate.show_sql=false + +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.url=jdbc:h2:file:${data.directory}/db/sammoa +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider + +sammoa.version=${project.version} +sammoa.url=${project.url} +sammoa.inceptionYear=${project.inceptionYear} +sammoa.organizationName=${license.organizationName} Property changes on: trunk/sammoa-ui-swing/src/main/filters/sammoa.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-29 09:08:29 UTC (rev 483) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-29 10:51:15 UTC (rev 484) @@ -58,6 +58,7 @@ import java.awt.Desktop; import java.io.File; import java.net.URL; +import java.util.Calendar; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -401,7 +402,18 @@ AboutPanel about = new AboutPanel(); about.setTitle(_("sammoa.title.about")); about.setAboutText(_("sammoa.about.message")); - about.setBottomText(context.getConfig().getCopyrightText()); + + SammoaConfig config = context.getConfig(); + int currentYear = Calendar.getInstance().get(Calendar.YEAR); + int inceptionYear = config.getInceptionYear(); + String years; + if (currentYear != inceptionYear) { + years = inceptionYear + "-" + currentYear; + } else { + years = inceptionYear + ""; + } + + about.setBottomText(_("sammoa.about.bottomText", config.getOrganizationName(), years, config.getVersion())); about.setIconPath(iconPath); about.setLicenseFile(licensePath); about.setThirdpartyFile(thirdPartyPath); Modified: trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-29 09:08:29 UTC (rev 483) +++ trunk/sammoa-ui-swing/src/main/resources/i18n/sammoa-ui-swing_en_GB.properties 2012-08-29 10:51:15 UTC (rev 484) @@ -1,4 +1,5 @@ SAMMOA=Sammoa +sammoa.about.bottomText=Copyright %s - %s - version %s sammoa.about.message=About Sammoa sammoa.action.about=About sammoa.action.about.tip=About Deleted: trunk/sammoa-ui-swing/src/main/resources/sammoa.properties =================================================================== --- trunk/sammoa-ui-swing/src/main/resources/sammoa.properties 2012-08-29 09:08:29 UTC (rev 483) +++ trunk/sammoa-ui-swing/src/main/resources/sammoa.properties 2012-08-29 10:51:15 UTC (rev 484) @@ -1,34 +0,0 @@ -### -# #%L -# SAMMOA :: UI Swing -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 UMS 3462, Code Lutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### -## DB Configuration -hibernate.hbm2ddl.auto=update -hibernate.show_sql=false - -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.url=jdbc:h2:file:${data.directory}/db/sammoa -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider

1 0

r483 - in trunk: sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util sammoa-ui-swing/src/main/resources/icons
by fdesbois＠users.forge.codelutin.com 29 Aug '12

29 Aug '12

Author: fdesbois Date: 2012-08-29 11:08:29 +0200 (Wed, 29 Aug 2012) New Revision: 483 Url: http://forge.codelutin.com/repositories/revision/sammoa/483 Log: refs #1422 : - missing validation icon - improve observation table refresh with proper lines - improve colors (background/foreground) - auto-select route from observation during validation Added: trunk/sammoa-ui-swing/src/main/resources/icons/action-tick.png Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaColors.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIModel.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaColorHighlighter.java trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/flightController/FlightControllerOnBoard.java 2012-08-29 09:08:29 UTC (rev 483) @@ -116,8 +116,7 @@ @Override public void locationChanged(GpsLocationEvent event) { GeoPoint newLocation = event.getNewValue(); - if (!GeoPoints.isCoordinatesEmpty(newLocation) /* && newLocation.getTopiaId() == null*/) { -// lastLocation = newLocation; + if (!GeoPoints.isCoordinatesEmpty(newLocation) && newLocation.getTopiaId() == null) { newLocation.setFlight(flight); persistence.delayEntityCreation(newLocation); } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Observations.java 2012-08-29 09:08:29 UTC (rev 483) @@ -26,7 +26,6 @@ import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -69,26 +68,26 @@ boolean ignoreDeleted) { return Iterables.filter(observations, inRoute(route, routes, ignoreDeleted)); } +// +// public static Observation findFirstInRoute(Iterable<Observation> observations, +// Route route, +// Iterable<Route> routes, +// boolean ignoreDeleted) { +// +// Observation result; +// if (route == null) { +// result = null; +// +// } else { +// +// result = FluentIterable.from(observations) +// .filter(inRoute(route, routes, ignoreDeleted)) +// .first() +// .orNull(); +// } +// return result; +// } - public static Observation findFirstInRoute(Iterable<Observation> observations, - Route route, - Iterable<Route> routes, - boolean ignoreDeleted) { - - Observation result; - if (route == null) { - result = null; - - } else { - - result = FluentIterable.from(observations) - .filter(inRoute(route, routes, ignoreDeleted)) - .first() - .orNull(); - } - return result; - } - public static boolean inRoute(Observation observation, Route route, Iterable<Route> routes, @@ -134,7 +133,7 @@ public static Predicate<Observation> inRoute(Route route, Iterable<Route> routes, boolean ignoreDeleted) { - return new ObservationInRoutePredicate(route, routes, ignoreDeleted); + return new InRoutePredicate(route, routes, ignoreDeleted); } public static void removeOtherSpecies(List<Observation> observations, @@ -197,7 +196,7 @@ } }; - private static class ObservationInRoutePredicate implements Predicate<Observation> { + private static class InRoutePredicate implements Predicate<Observation> { protected Route route; @@ -205,9 +204,9 @@ protected boolean ignoreDeleted; - public ObservationInRoutePredicate(Route route, - Iterable<Route> routes, - boolean ignoreDeleted) { + public InRoutePredicate(Route route, + Iterable<Route> routes, + boolean ignoreDeleted) { Preconditions.checkNotNull(route); Preconditions.checkNotNull(routes); this.route = route; Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/Routes.java 2012-08-29 09:08:29 UTC (rev 483) @@ -25,6 +25,7 @@ import com.google.common.base.Function; import com.google.common.base.Objects; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; @@ -61,10 +62,6 @@ return Iterables.transform(routes, TO_DATE_FUNCTION); } -// public static Iterable<TransectFlight> toTransectFlights(Iterable<Route> routes) { -// return Iterables.transform(routes, TO_TRANSECT_FLIGHT_FUNCTION); -// } - public static Set<ObserverPosition> toObserverPositions(Iterable<Route> routes) { Set<ObserverPosition> result = Sets.newHashSet(); for (Route route : routes) { @@ -156,6 +153,13 @@ return getNext(routes, route, orderByDate()); } + public static Route findWithObservation(Iterable<Route> routes, + Observation observation, + boolean ignoreDeleted) { + + return Iterables.find(routes, new WithObservationPredicate(observation, routes, ignoreDeleted), null); + } + public static Date getMiddleTime(Route previousRoute, Route nextRoute) { Date previousTime = previousRoute.getBeginTime(); Date nextTime = nextRoute.getBeginTime(); @@ -202,14 +206,30 @@ } }; -// private static Function<Route, TransectFlight> TO_TRANSECT_FLIGHT_FUNCTION = new Function<Route, TransectFlight>() { -// -// @Override -// public TransectFlight apply(Route input) { -// return input.getTransectFlight(); -// } -// }; + private static class WithObservationPredicate implements Predicate<Route> { + protected Observation observation; + + protected Iterable<Route> routes; + + protected boolean ignoreDeleted; + + public WithObservationPredicate(Observation observation, + Iterable<Route> routes, + boolean ignoreDeleted) { + Preconditions.checkNotNull(observation); + Preconditions.checkNotNull(routes); + this.observation = observation; + this.routes = routes; + this.ignoreDeleted = ignoreDeleted; + } + + @Override + public boolean apply(Route input) { + return Observations.inRoute(observation, input, routes, ignoreDeleted); + } + } + private static <T> T getNext(Iterable<T> elements, final T element, final Comparator<T> comparator) { Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/MainUIHandler.java 2012-08-29 09:08:29 UTC (rev 483) @@ -52,7 +52,9 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.UIManager; +import javax.swing.plaf.BorderUIResource; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Desktop; import java.io.File; import java.net.URL; @@ -113,6 +115,9 @@ SwingUtil.getLayer(ui.getBody()).setUI(new BetaLayerUI()); + UIManager.put("Table.focusCellHighlightBorder", + new BorderUIResource.LineBorderUIResource(Color.BLACK)); + setScreen(SammoaScreen.HOME); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaColors.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaColors.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/SammoaColors.java 2012-08-29 09:08:29 UTC (rev 483) @@ -49,14 +49,18 @@ public static final Color POSITION_RIGHT_COLOR = Color.GREEN; - public static final Color NEXT_TRANSECT_ROW_COLOR = new Color(233, 255, 235); +// public static final Color NEXT_TRANSECT_ROW_COLOR = new Color(233, 255, 235); + public static final Color NEXT_TRANSECT_ROW_COLOR = new Color(152, 106, 255); + public static final Color OBSERVATION_FOR_ROUTE_ROW_COLOR = new Color(171, 214, 255); - public static final Color ROUTE_FOR_TRANSECT_ROW_COLOR = new Color(171, 214, 255); +// public static final Color ROUTE_FOR_TRANSECT_ROW_COLOR = new Color(171, 214, 255); - public static final Color ROUTE_NO_MODIFICATION_ROW_COLOR = new Color(255, 233, 233); +// public static final Color ROUTE_NO_MODIFICATION_ROW_COLOR = new Color(255, 233, 233); + public static final Color ROUTE_NO_MODIFICATION_ROW_COLOR = Color.RED; + public static final Color FLIGHT_TRACKING_LINE_COLOR = Color.RED; public static final Color TRANSECT_LINE_COLOR = new Color(102, 0, 255); @@ -67,6 +71,8 @@ public static final Color DELETED_ROW_COLOR = Color.GRAY; - public static final Color VALID_ROW_COLOR = Color.GREEN; + public static final Color VALID_ROW_COLOR = new Color(9, 157, 20); +// public static final Color SELECTED_ROW_COLOR = new Color(171, 214, 255); + } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIHandler.java 2012-08-29 09:08:29 UTC (rev 483) @@ -136,6 +136,7 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; +import java.awt.Color; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.awt.event.ItemEvent; @@ -478,24 +479,26 @@ column.setCellRenderer(editorRenderer); } - table.addHighlighter(SammoaUtil.newColorHighlighter( + table.addHighlighter(SammoaUtil.newBackgroundColorHighlighter( new CurrentTransectHighlightPredicate(tableModel), SammoaColors.CURRENT_TRANSECT_ROW_COLOR) ); - table.addHighlighter(SammoaUtil.newColorHighlighter( + table.addHighlighter(SammoaUtil.newBackgroundColorHighlighter( new NextTransectHighlightPredicate(tableModel), SammoaColors.NEXT_TRANSECT_ROW_COLOR) ); - table.addHighlighter(SammoaUtil.newColorHighlighter( + table.addHighlighter(SammoaUtil.newForegroundColorHighlighter( new DeletedRowHighlightPredicate(getModel().getTransectFlights()), SammoaColors.DELETED_ROW_COLOR) ); - table.addHighlighter(SammoaUtil.newColorHighlighter( + table.addHighlighter(SammoaUtil.newForegroundColorHighlighter( new ValidRowHighlightPredicate(getModel().getTransectFlights()), SammoaColors.VALID_ROW_COLOR) ); table.setSortable(false); + table.setSelectionBackground(null); + table.setSelectionForeground(Color.BLACK); } startTime = timeLog.log(startTime, "afterInitUI", "decoration done (editor/renderer)"); Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIModel.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIModel.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/flight/FlightUIModel.java 2012-08-29 09:08:29 UTC (rev 483) @@ -220,6 +220,10 @@ return getObservations().indexOf(observation); } + public int sizeObservations() { + return getObservations().size(); + } + public void setObservations(List<Observation> observations) { this.observations = observations; firePropertyChange(PROPERTY_OBSERVATIONS, null, observations); @@ -227,14 +231,14 @@ public void addObservation(Observation observation) { List<Observation> oldValue = Lists.newArrayList(getObservations()); - int index = getObservations().size(); + int index = sizeObservations(); getObservations().add(observation); fireIndexedPropertyChange(PROPERTY_OBSERVATIONS, index, oldValue, getObservations()); } public void removeObservation(Observation observation) { List<Observation> oldValue = Lists.newArrayList(getObservations()); - int index = getObservations().indexOf(observation); + int index = indexOfObservations(observation); getObservations().remove(index); fireIndexedPropertyChange(PROPERTY_OBSERVATIONS, index, oldValue, getObservations()); } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/observations/EffortPanelHandler.java 2012-08-29 09:08:29 UTC (rev 483) @@ -24,6 +24,7 @@ */ import com.google.common.base.Supplier; +import com.google.common.collect.Iterables; import fr.ulr.sammoa.application.FlightService; import fr.ulr.sammoa.application.device.DeviceState; import fr.ulr.sammoa.application.device.DeviceStateEvent; @@ -284,7 +285,7 @@ // Highlighter for no modification dataTable.addHighlighter( - SammoaUtil.newColorHighlighter( + SammoaUtil.newForegroundColorHighlighter( new RouteNoModificationHighlightPredicate(tableModel), SammoaColors.ROUTE_NO_MODIFICATION_ROW_COLOR) ); @@ -302,11 +303,11 @@ NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); - dataTable.addHighlighter(SammoaUtil.newColorHighlighter( + dataTable.addHighlighter(SammoaUtil.newForegroundColorHighlighter( new DeletedRowHighlightPredicate(flightUIModel.getRoutes()), SammoaColors.DELETED_ROW_COLOR) ); - dataTable.addHighlighter(SammoaUtil.newColorHighlighter( + dataTable.addHighlighter(SammoaUtil.newForegroundColorHighlighter( new ValidRowHighlightPredicate(flightUIModel.getRoutes()), SammoaColors.VALID_ROW_COLOR) ); @@ -342,50 +343,21 @@ ui.getObservationTableModel()) ); + // For CircleBack buttons flightUIModel.addPropertyChangeListener( - FlightUIModel.PROPERTY_FLIGHT_STATE, new PropertyChangeListener() { + FlightUIModel.PROPERTY_FLIGHT_STATE, observationUpdateListener); - @Override - public void propertyChange(PropertyChangeEvent evt) { - // les boutons sur toutes les lignes - // doivent être mis à jour, donc on fait un fire - // sur toute la table - logger.debug("Flight state changed, reload observation table data"); - ui.getObservationTableModel().fireTableDataChanged(); - } - }); - + // For highlighting depends on selected route flightUIModel.addPropertyChangeListener( - FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, new PropertyChangeListener() { + FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, observationUpdateListener); - @Override - public void propertyChange(PropertyChangeEvent evt) { - - logger.debug("Route edition/selection changed, reload observation table data"); - ui.getObservationTableModel().fireTableDataChanged(); - - FlightUIModel flightUIModel = (FlightUIModel) evt.getSource(); - - Observation observation = - Observations.findFirstInRoute(flightUIModel.getObservations(), - (Route) evt.getNewValue(), - flightUIModel.getRoutes(), - true); - - if (observation != null) { - int firstRowIndex = flightUIModel.indexOfObservations(observation); - ui.getObservationTable().scrollRowToVisible(firstRowIndex); - } - } - }); - JXTable dataTable = ui.getObservationTable(); // set combobox renderer for ObservationStatus dataTable.setDefaultEditor(ObservationStatus.class, new DefaultCellEditor(new JComboBox(ObservationStatus.values()))); dataTable.addHighlighter( - SammoaUtil.newColorHighlighter( + SammoaUtil.newBackgroundColorHighlighter( new ObservationForSelectedRouteHighlightPredicate(flightUIModel), SammoaColors.OBSERVATION_FOR_ROUTE_ROW_COLOR) ); @@ -463,6 +435,16 @@ if (logger.isInfoEnabled()) { logger.info("Select observation from index {}", newSelectedRow); } + + // We need to auto-select the route in validation mode + if (flightUIModel.isValidationMode()) { + Route route = Routes.findWithObservation( + flightUIModel.getRoutes(), observation, true); + + int routeIndex = flightUIModel.indexOfRoutes(route); + ui.getRouteTable().getSelectionModel().setSelectionInterval(routeIndex, routeIndex); + } + } else { if (logger.isInfoEnabled()) { logger.info("No observation selected"); @@ -509,11 +491,11 @@ NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); - dataTable.addHighlighter(SammoaUtil.newColorHighlighter( + dataTable.addHighlighter(SammoaUtil.newForegroundColorHighlighter( new DeletedRowHighlightPredicate(flightUIModel.getObservations()), SammoaColors.DELETED_ROW_COLOR) ); - dataTable.addHighlighter(SammoaUtil.newColorHighlighter( + dataTable.addHighlighter(SammoaUtil.newForegroundColorHighlighter( new ValidRowHighlightPredicate(flightUIModel.getObservations()), SammoaColors.VALID_ROW_COLOR) ); @@ -548,7 +530,7 @@ validator, dataLocator ); - Highlighter highlighter = SammoaUtil.newColorHighlighter( + Highlighter highlighter = SammoaUtil.newBackgroundColorHighlighter( predicate, SwingValidatorUtil.getColor(scope)); editor.addHighlighter(highlighter); } @@ -643,6 +625,8 @@ // make tab key to focus only next editable cell table.setSelectionModel(new ForceSelectionSelectionModel()); + table.setSelectionBackground(null); + table.setSelectionForeground(Color.BLACK); // table.setSortable(context.isValidationMode()); table.setSortable(false); @@ -745,6 +729,70 @@ }); } + private PropertyChangeListener observationUpdateListener = new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + +// int selectedRow = ui.getObservationTable().getSelectedRow(); + +// ui.getObservationTableModel().fireTableDataChanged(); + + if (FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN.equals(evt.getPropertyName())) { + + + Route oldValue = (Route) evt.getOldValue(); + if (oldValue != null) { + updateObservationTable(oldValue, false); + } + Route newValue = (Route) evt.getNewValue(); + if (newValue != null) { + updateObservationTable(newValue, true); + } + + } else { + + ui.getObservationTableModel().fireTableRowsUpdated( + 0, ui.getFlightUIModel().sizeObservations() - 1); + } + + +// if (selectedRow != -1) { +// ui.getObservationTable().scrollRowToVisible(selectedRow); +// ui.getObservationTable().setRowSelectionInterval(selectedRow, selectedRow); +// } + } + }; + + protected void updateObservationTable(Route route, boolean scrollToFirst) { + + FlightUIModel model = ui.getFlightUIModel(); + + Iterable<Observation> observations = + Observations.filterInRoute(model.getObservations(), route, model.getRoutes(), true); + + if (Iterables.isEmpty(observations)) { + // nothing to do + } else { + + int firstIndex = -1; + int lastIndex = -1; + for (Observation observation : observations) { + int index = model.indexOfObservations(observation); + if (firstIndex == -1 || firstIndex > index) { + firstIndex = index; + } + if (lastIndex == -1 || lastIndex < index) { + lastIndex = index; + } + } + ui.getObservationTableModel().fireTableRowsUpdated(firstIndex, lastIndex); + if (scrollToFirst) { + ui.getObservationTable().scrollRowToVisible(firstIndex); + } + } + } + private static class RouteValidatorDataLocator implements SwingListValidatorDataLocator<Route> { @Override Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaColorHighlighter.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaColorHighlighter.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaColorHighlighter.java 2012-08-29 09:08:29 UTC (rev 483) @@ -28,6 +28,7 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.util.PaintUtils; +import javax.swing.JButton; import java.awt.Color; import java.awt.Component; @@ -40,16 +41,29 @@ protected Color color; - public SammoaColorHighlighter(HighlightPredicate predicate, Color color) { + protected boolean foreground; + + public SammoaColorHighlighter(HighlightPredicate predicate, Color color, boolean foreground) { super(predicate); this.color = color; + this.foreground = foreground; } @Override protected Component doHighlight(Component component, ComponentAdapter adapter) { - component.setBackground(color); - if (adapter.isSelected()) { - component.setForeground(PaintUtils.computeForeground(color)); + if (component instanceof JButton) { + // do nothing + + } else { + if (foreground) { + component.setForeground(color); + + } else { + component.setBackground(color); + if (adapter.isSelected()) { + component.setForeground(PaintUtils.computeForeground(color)); + } + } } return component; } Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java 2012-08-29 09:08:11 UTC (rev 482) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/SammoaUtil.java 2012-08-29 09:08:29 UTC (rev 483) @@ -36,8 +36,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.swing.*; -import java.awt.*; +import javax.swing.Action; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JOptionPane; +import javax.swing.JRootPane; +import javax.swing.JTable; +import javax.swing.KeyStroke; +import javax.swing.UIManager; +import java.awt.Color; +import java.awt.Component; +import java.awt.Cursor; +import java.awt.Dimension; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; @@ -56,10 +67,14 @@ // never instanciate util class } - public static Highlighter newColorHighlighter(HighlightPredicate predicate, Color color) { - return new SammoaColorHighlighter(predicate, color); + public static Highlighter newBackgroundColorHighlighter(HighlightPredicate predicate, Color color) { + return new SammoaColorHighlighter(predicate, color, false); } + public static Highlighter newForegroundColorHighlighter(HighlightPredicate predicate, Color color) { + return new SammoaColorHighlighter(predicate, color, true); + } + public static Object getPropertyValue(Object bean, String... properties) { Object result; try { Added: trunk/sammoa-ui-swing/src/main/resources/icons/action-tick.png =================================================================== (Binary files differ) Property changes on: trunk/sammoa-ui-swing/src/main/resources/icons/action-tick.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r482 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect
by fdesbois＠users.forge.codelutin.com 29 Aug '12

29 Aug '12

Author: fdesbois Date: 2012-08-29 11:08:11 +0200 (Wed, 29 Aug 2012) New Revision: 482 Url: http://forge.codelutin.com/repositories/revision/sammoa/482 Log: refs #1422 : resolve issue with strate decoration in new transect UI Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java 2012-08-29 08:56:54 UTC (rev 481) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/transect/TransectUIHandler.java 2012-08-29 09:08:11 UTC (rev 482) @@ -26,7 +26,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ulr.sammoa.application.ReferentialService; -import fr.ulr.sammoa.persistence.Strate; import fr.ulr.sammoa.persistence.Transect; import fr.ulr.sammoa.ui.swing.SammoaUIContext; import fr.ulr.sammoa.ui.swing.SammoaUIHandler; @@ -88,7 +87,7 @@ context.getService(UIDecoratorService.class); ui.getTransectStrateComboBox().setRenderer( - decoratorService.newListCellRender(Strate.class)); + decoratorService.newListCellRender(StrateModel.class)); SwingValidatorUtil.installUI(ui.getErrorTable(), new SwingValidatorMessageTableRenderer()); }

1 0

r481 - trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action
by fdesbois＠users.forge.codelutin.com 29 Aug '12

29 Aug '12

Author: fdesbois Date: 2012-08-29 10:56:54 +0200 (Wed, 29 Aug 2012) New Revision: 481 Url: http://forge.codelutin.com/repositories/revision/sammoa/481 Log: fixes #1424 : resolve issue with route dooblon delete and validation button activation Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ValidRouteAction.java Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ValidRouteAction.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ValidRouteAction.java 2012-08-28 20:43:32 UTC (rev 480) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/action/ValidRouteAction.java 2012-08-29 08:56:54 UTC (rev 481) @@ -38,6 +38,8 @@ import javax.swing.Action; import java.awt.event.ActionEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n._; @@ -58,7 +60,24 @@ public ValidRouteAction(JAXXContext context) { super(_("sammoa.action.validRoute"), context); putValue(Action.SHORT_DESCRIPTION, _("sammoa.action.validRoute.tip")); - bindModelProperties(FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN); + getModel().addPropertyChangeListener( + FlightUIModel.PROPERTY_ROUTE_EDIT_BEAN, new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + Route oldValue = (Route) evt.getOldValue(); + if (oldValue != null) { + oldValue.removePropertyChangeListener( + Route.PROPERTY_DELETED, enabledListener); + } + Route newValue = (Route) evt.getNewValue(); + if (newValue != null) { + newValue.addPropertyChangeListener( + Route.PROPERTY_DELETED, enabledListener); + } + enabledListener.propertyChange(evt); + } + }); } @Override

1 0

r480 - trunk
by tchemit＠users.forge.codelutin.com 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 22:43:32 +0200 (Tue, 28 Aug 2012) New Revision: 480 Url: http://forge.codelutin.com/repositories/revision/sammoa/480 Log: updates to mavenpom 3.3.7-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-25 08:22:27 UTC (rev 479) +++ trunk/pom.xml 2012-08-28 20:43:32 UTC (rev 480) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.6</version> + <version>3.3.7-SNAPSHOT</version> </parent> <groupId>fr.ulr</groupId>

1 0

r479 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 25 Aug '12

25 Aug '12

Author: maven-release Date: 2012-08-25 10:22:27 +0200 (Sat, 25 Aug 2012) New Revision: 479 Url: http://forge.codelutin.com/repositories/revision/sammoa/479 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-25 08:22:20 UTC (rev 478) +++ trunk/pom.xml 2012-08-25 08:22:27 UTC (rev 479) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> <modules> <module>sammoa-persistence</module> @@ -81,12 +81,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-08-25 08:22:20 UTC (rev 478) +++ trunk/sammoa-application/pom.xml 2012-08-25 08:22:27 UTC (rev 479) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-08-25 08:22:20 UTC (rev 478) +++ trunk/sammoa-persistence/pom.xml 2012-08-25 08:22:27 UTC (rev 479) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-08-25 08:22:20 UTC (rev 478) +++ trunk/sammoa-ui-swing/pom.xml 2012-08-25 08:22:27 UTC (rev 479) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r478 - tags
by maven-release＠users.forge.codelutin.com 25 Aug '12

25 Aug '12

Author: maven-release Date: 2012-08-25 10:22:20 +0200 (Sat, 25 Aug 2012) New Revision: 478 Url: http://forge.codelutin.com/repositories/revision/sammoa/478 Log: [maven-release-plugin] copy for tag sammoa-0.6 Added: tags/sammoa-0.6/

1 0

r477 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 25 Aug '12

25 Aug '12

Author: maven-release Date: 2012-08-25 10:22:13 +0200 (Sat, 25 Aug 2012) New Revision: 477 Url: http://forge.codelutin.com/repositories/revision/sammoa/477 Log: [maven-release-plugin] prepare release sammoa-0.6 Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 17:47:46 UTC (rev 476) +++ trunk/pom.xml 2012-08-25 08:22:13 UTC (rev 477) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> <modules> <module>sammoa-persistence</module> @@ -81,12 +81,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6 </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-08-24 17:47:46 UTC (rev 476) +++ trunk/sammoa-application/pom.xml 2012-08-25 08:22:13 UTC (rev 477) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-08-24 17:47:46 UTC (rev 476) +++ trunk/sammoa-persistence/pom.xml 2012-08-25 08:22:13 UTC (rev 477) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-08-24 17:47:46 UTC (rev 476) +++ trunk/sammoa-ui-swing/pom.xml 2012-08-25 08:22:13 UTC (rev 477) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0

r476 - in trunk: . sammoa-application sammoa-persistence sammoa-ui-swing
by maven-release＠users.forge.codelutin.com 24 Aug '12

24 Aug '12

Author: maven-release Date: 2012-08-24 19:47:46 +0200 (Fri, 24 Aug 2012) New Revision: 476 Url: http://forge.codelutin.com/repositories/revision/sammoa/476 Log: [maven-release-plugin] rollback the release of sammoa-0.6 Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-24 17:39:19 UTC (rev 475) +++ trunk/pom.xml 2012-08-24 17:47:46 UTC (rev 476) @@ -15,7 +15,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6</version> + <version>0.6-SNAPSHOT</version> <modules> <module>sammoa-persistence</module> @@ -81,12 +81,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6</url> + <url>http://svn.forge.codelutin.com/svn/sammoa/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/sammoa/tags/sammoa-0.6 + scm:svn:http://svn.forge.codelutin.com/svn/sammoa/trunk </developerConnection> </scm> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2012-08-24 17:39:19 UTC (rev 475) +++ trunk/sammoa-application/pom.xml 2012-08-24 17:47:46 UTC (rev 476) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2012-08-24 17:39:19 UTC (rev 475) +++ trunk/sammoa-persistence/pom.xml 2012-08-24 17:47:46 UTC (rev 476) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2012-08-24 17:39:19 UTC (rev 475) +++ trunk/sammoa-ui-swing/pom.xml 2012-08-24 17:47:46 UTC (rev 476) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>0.6</version> + <version>0.6-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId>

1 0