Revision: 5055
http://sourceforge.net/p/jump-pilot/code/5055
Author: michaudm
Date: 2016-10-08 10:29:59 +0000 (Sat, 08 Oct 2016)
Log Message:
-----------
Fix bug #433 throwing exception when applying scale limits in bad order
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/de/latlon/deejump/plugin/style/DeeChangeStylesPlugIn.java
core/trunk/src/language/jump_fr.properties
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2016-10-07 07:06:53 UTC (rev 5054)
+++ core/trunk/ChangeLog 2016-10-08 10:29:59 UTC (rev 5055)
@@ -3,6 +3,10 @@
# 2. make sure that lines break at 80 chars for constricted display situations
#<-------------------------------- 80 chars
---------------------------------->#
+2016-10-08
+ * Fix bug #433 throwing exception when applying scale limits in bad order
+ * Optimization : changeStyle was applying the new style two times
+
2016-10-07 mmichaud <[email protected]>
* Fix SaveLayersWithoutDataSourcePlugIn by using JFileChooser instead of
JFCWithEnterAction
Modified:
core/trunk/src/de/latlon/deejump/plugin/style/DeeChangeStylesPlugIn.java
===================================================================
--- core/trunk/src/de/latlon/deejump/plugin/style/DeeChangeStylesPlugIn.java
2016-10-07 07:06:53 UTC (rev 5054)
+++ core/trunk/src/de/latlon/deejump/plugin/style/DeeChangeStylesPlugIn.java
2016-10-08 10:29:59 UTC (rev 5055)
@@ -60,6 +60,7 @@
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
import com.vividsolutions.jump.workbench.ui.MultiInputDialog;
+import com.vividsolutions.jump.workbench.ui.OKCancelApplyPanel;
import com.vividsolutions.jump.workbench.ui.WorkbenchFrame;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
import com.vividsolutions.jump.workbench.ui.plugin.PersistentBlackboardPlugIn;
@@ -160,7 +161,16 @@
dialog.addOKCancelApplyPanelActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e) {
if (dialog.wasApplyPressed()) {
- testStyles(layer, stylePanels, context);
+ for (final StylePanel stylePanel : stylePanels) {
+ if (stylePanel.validateInput() != null) {
+ context.getWorkbenchFrame().handleThrowable(
+ new Exception(stylePanel.validateInput()),
dialog);
+ return;
+ }
+ }
+ if (dialog.wasApplyPressed()) {
+ testStyles(layer, stylePanels, context);
+ }
}
}
}
@@ -194,7 +204,6 @@
private void applyStyles(final Layer layer, final ArrayList<StylePanel>
stylePanels,
final Collection<?> oldStyles, final PlugInContext context) {
-
layer.getLayerManager().deferFiringEvents(new Runnable() {
public void run() {
for (final StylePanel stylePanel : stylePanels) {
Modified: core/trunk/src/language/jump_fr.properties
===================================================================
--- core/trunk/src/language/jump_fr.properties 2016-10-07 07:06:53 UTC (rev
5054)
+++ core/trunk/src/language/jump_fr.properties 2016-10-08 10:29:59 UTC (rev
5055)
@@ -2420,9 +2420,9 @@
ui.style.ScaleStylePanel.smaller-units-pixel = Un pixel repr\u00e9sente une
plus petite taille en unit\u00e9s terrain
ui.style.ScaleStylePanel.smallest-scale = La plus petite \u00e9chelle
ui.style.ScaleStylePanel.units-pixel = Unit\u00e9s/Pixel
-ui.style.ScaleStylePanel.units-pixel-at-largest-scale-must-be-greater-than-0 =
La valeur de Unit\u00e9/Pixel \u00e0 la plus grande \u00e9chelle doit \u00eatre
sup\u00e9rieure \u00e0 0
-ui.style.ScaleStylePanel.units-pixel-at-smallest-scale-must-be-greater-than-0
= La valeur de Unit\u00e9/Pixel \u00e0 la plus petite \u00e9chelle doit
\u00eatre sup\u00e9rieure \u00e0 0
-ui.style.ScaleStylePanel.units-pixel-at-smallest-scale-must-be-larger-than-units-pixel-at-largest-scale
= La valeur de Unit\u00e9/Pixel doit \u00eatre plus grand pour la plus petite
\u00e9chelle que pour la plus grande \u00e9chelle
+ui.style.ScaleStylePanel.units-pixel-at-largest-scale-must-be-greater-than-0 =
Le d\xE9nominateur de la plus grande \u00e9chelle doit \u00eatre
sup\u00e9rieure \u00e0 0
+ui.style.ScaleStylePanel.units-pixel-at-smallest-scale-must-be-greater-than-0
= Le d\xE9nominateur de la plus petite \u00e9chelle doit \u00eatre
sup\u00e9rieure \u00e0 0
+ui.style.ScaleStylePanel.units-pixel-at-smallest-scale-must-be-larger-than-units-pixel-at-largest-scale
= Le d\u00e9nominateur doit \u00eatre plus grand pour la petite \u00e9chelle
que pour la grande
ui.task.TaskMonitorDialog.busy = Occup\u00e9
ui.task.TaskMonitorDialog.cancel = Annuler
ui.task.TaskMonitorDialog.subtask-progress-goes-here = Progression de la
sous-t\u00e2che
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
