Revision: 5371
http://sourceforge.net/p/jump-pilot/code/5371
Author: michaudm
Date: 2017-03-13 22:45:10 +0000 (Mon, 13 Mar 2017)
Log Message:
-----------
Small improvements in UpdateWithJoinPlugIn
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/org/openjump/core/ui/plugin/tools/UpdateWithJoinPlugIn.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2017-03-13 21:08:46 UTC (rev 5370)
+++ core/trunk/ChangeLog 2017-03-13 22:45:10 UTC (rev 5371)
@@ -3,6 +3,9 @@
# 2. make sure that lines break at 80 chars for constricted display situations
#<-------------------------------- 80 chars
---------------------------------->#
+2017-03-13 mmichaud <[email protected]>
+ * Small improvements in UpdateWithJoinPlugIn
+
2017-03-12 ede
* fix regression "#455 UI problem with decimal parameters and Locale"
rendering MultiInputDialog based plugins using decimal values unusable for
Modified:
core/trunk/src/org/openjump/core/ui/plugin/tools/UpdateWithJoinPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/tools/UpdateWithJoinPlugIn.java
2017-03-13 21:08:46 UTC (rev 5370)
+++ core/trunk/src/org/openjump/core/ui/plugin/tools/UpdateWithJoinPlugIn.java
2017-03-13 22:45:10 UTC (rev 5371)
@@ -67,7 +67,7 @@
public static MultiEnableCheck createEnableCheck(WorkbenchContext
workbenchContext) {
EnableCheckFactory checkFactory = new
EnableCheckFactory(workbenchContext);
return new MultiEnableCheck()
- .add(checkFactory.createTaskWindowMustBeActiveCheck())
+
.add(checkFactory.createWindowWithAssociatedTaskFrameMustBeActiveCheck())
.add(checkFactory.createAtLeastNLayersMustExistCheck(2));
}
@@ -383,7 +383,11 @@
List<String> candidates = filter.filter(joinLayer);
candidates.add(0, DO_NOT_JOIN);
candidates.remove(joinLayerId);
- dialog.addComboBox(name, candidates.contains(name) ? name :
DO_NOT_JOIN, candidates, "");
+ dialog.addComboBox(name,
+ candidates.contains(name) && type !=
AttributeType.GEOMETRY ?
+ name :
+ DO_NOT_JOIN,
+ candidates, "");
}
return dialog;
}
------------------------------------------------------------------------------
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
